diff --git a/source/java/org/alfresco/web/scripts/DeclarativeWebScriptRegistry.java b/source/java/org/alfresco/web/scripts/DeclarativeWebScriptRegistry.java
index a9baeae517..f00cd37b26 100644
--- a/source/java/org/alfresco/web/scripts/DeclarativeWebScriptRegistry.java
+++ b/source/java/org/alfresco/web/scripts/DeclarativeWebScriptRegistry.java
@@ -140,7 +140,7 @@ public class DeclarativeWebScriptRegistry extends AbstractLifecycleBean
         {
             public String resolveImagePathForName(String filename, FileTypeImageSize size)
             {
-                return Utils.getFileTypeImage(FacesContext.getCurrentInstance(), filename, size);
+                return Utils.getFileTypeImage(servletContext, filename, size);
             }  
         };        
     }
diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java
index 6da1ccfdf4..c423d334a7 100644
--- a/source/java/org/alfresco/web/ui/common/Utils.java
+++ b/source/java/org/alfresco/web/ui/common/Utils.java
@@ -1285,6 +1285,11 @@ public final class Utils
                   // found the image for this extension - save it for later
                   s_fileExtensionMap.put(key, image);
                }
+               else if ((fc == null) && (sc == null))
+               {
+                  // we have neither FacesContext nor ServerContext so return the default image but don't cache it
+                  image = defaultImage;
+               }
                else
                {
                   // not found, save the default image for this extension instead