diff --git a/source/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerWorker.java b/source/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerWorker.java
index 455ee27be3..8edaeefd77 100644
--- a/source/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerWorker.java
+++ b/source/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerWorker.java
@@ -240,15 +240,7 @@ public class RuntimeExecutableContentTransformerWorker extends ContentTransforme
         // add the source and target properties
         properties.put(VAR_SOURCE, sourceFile.getAbsolutePath());
         properties.put(VAR_TARGET, targetFile.getAbsolutePath());
-        
-        if (options.getPageLimit() >=0)
-        {
-            properties.put(VAR_PAGE_RANGE, "0-" + options.getPageLimit());
-        }
-        else
-        {
-            properties.put(VAR_PAGE_RANGE, "");
-        }
+        properties.put(VAR_PAGE_RANGE, "0-"+(options.getPageLimit() >=0 ? options.getPageLimit() : ""));
         
         // pull reader file into source temp file
         reader.getContent(sourceFile);
diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java
index 7e35936dc2..13a7171874 100644
--- a/source/java/org/alfresco/repo/jscript/ScriptNode.java
+++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java
@@ -2798,19 +2798,21 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
         }
         
         // If there's nothing currently registered to generate thumbnails for the
-        //  specified mimetype, then log a message and bail out
+        // specified mimetype, then log a message and bail out
         String nodeMimeType = getMimetype();
         Serializable value = this.nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
         ContentData contentData = DefaultTypeConverter.INSTANCE.convert(ContentData.class, value);
-        if (contentData == null)
+        if (!ContentData.hasContent(contentData) ||
+            !services.getContentService().getReader(nodeRef, ContentModel.PROP_CONTENT).exists())
         {
-            logger.info("Unable to create thumbnail '" + details.getName() + "' as there is no content");
+            if (logger.isDebugEnabled())
+                logger.debug("Unable to create thumbnail '" + details.getName() + "' as there is no content");
             return null;
         }
         if (!registry.isThumbnailDefinitionAvailable(contentData.getContentUrl(), nodeMimeType, getSize(), nodeRef, details))
         {
             logger.info("Unable to create thumbnail '" + details.getName() + "' for " +
-                    nodeMimeType + " as no transformer is currently available");
+                        nodeMimeType + " as no transformer is currently available.");
             return null;
         }