keycloak-memoizeit

diff --git a/services/src/main/java/org/keycloak/theme/FolderThemeProvider.java b/services/src/main/java/org/keycloak/theme/FolderThemeProvider.java
index 43f578b..5c75f56 100755
--- a/services/src/main/java/org/keycloak/theme/FolderThemeProvider.java
+++ b/services/src/main/java/org/keycloak/theme/FolderThemeProvider.java
@@ -42,12 +42,20 @@ public class FolderThemeProvider implements ThemeProvider {
 
     @Override
     public Theme getTheme(String name, Theme.Type type) throws IOException {
+        if (themesDir == null) {
+            return null;
+        }
+
         File themeDir = getThemeDir(name, type);
         return themeDir.isDirectory() ? new FolderTheme(themeDir, name, type) : null;
     }
 
     @Override
     public Set<String> nameSet(Theme.Type type) {
+        if (themesDir == null) {
+            return Collections.emptySet();
+        }
+
         final String typeName = type.name().toLowerCase();
         File[] themeDirs = themesDir.listFiles(new FileFilter() {
             @Override
@@ -68,7 +76,7 @@ public class FolderThemeProvider implements ThemeProvider {
 
     @Override
     public boolean hasTheme(String name, Theme.Type type) {
-        return getThemeDir(name, type).isDirectory();
+        return themesDir != null ? getThemeDir(name, type).isDirectory() : false;
     }
 
     @Override

diff --git a/services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java b/services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java
index 694891d..38ae742 100755
--- a/services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java
+++ b/services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java
@@ -59,4 +59,5 @@ public class FolderThemeProviderFactory implements ThemeProviderFactory {
     public String getId() {
         return "folder";
     }
+
 }