1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index 9e697a03cb..54f5885b37 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -570,8 +570,14 @@ public class ApplicationConnection {
      * @return translated URI ready for browser
      */
     public String translateToolkitUri(String toolkitUri) {
-        if (toolkitUri.startsWith("theme")) {
-            toolkitUri = getThemeUri() + toolkitUri.substring(7);
+        if (toolkitUri.startsWith("theme://")) {
+            String themeUri = getThemeUri();
+            if (themeUri == null) {
+                console
+                        .error("Theme not set: ThemeResource will not be found. ("
+                                + toolkitUri + ")");
+            }
+            toolkitUri = themeUri + toolkitUri.substring(7);
         }
         return toolkitUri;
     }