diff --git a/source/net/filebot/format/AssociativeScriptObject.java b/source/net/filebot/format/AssociativeScriptObject.java index 0272482b..c2e48ea5 100644 --- a/source/net/filebot/format/AssociativeScriptObject.java +++ b/source/net/filebot/format/AssociativeScriptObject.java @@ -29,7 +29,7 @@ public class AssociativeScriptObject extends GroovyObjectSupport implements Iter return value; } - return super.getProperty(name); + return super.getProperty(name); // throw MissingPropertyException } @Override diff --git a/source/net/filebot/format/MediaBindingBean.java b/source/net/filebot/format/MediaBindingBean.java index bdfcb0c0..1b82d103 100644 --- a/source/net/filebot/format/MediaBindingBean.java +++ b/source/net/filebot/format/MediaBindingBean.java @@ -1230,7 +1230,18 @@ public class MediaBindingBean { return null; // never throw exceptions for empty or null values } }; - return new AssociativeScriptObject(new ExpressionBindings(mediaBindingBean)); + + return new AssociativeScriptObject(new ExpressionBindings(mediaBindingBean)) { + + @Override + public Object getProperty(String name) { + try { + return super.getProperty(name); + } catch (Exception e) { + return null; // never throw exceptions for empty or null values + } + } + }; } private AssociativeScriptObject createPropertyBindings(Object object) { @@ -1239,12 +1250,11 @@ public class MediaBindingBean { @Override public Object getProperty(String name) { Object value = super.getProperty(name); + if (value == null) { return undefined(name); } - if (value instanceof CharSequence) { - return replacePathSeparators(value.toString()).trim(); // auto-clean value of path separators - } + return value; } };