From dcf6da2a51952a02e7ab08f2d367c39b1a95ce2d Mon Sep 17 00:00:00 2001
From: Bill Burke <bburke@redhat.com>
Date: Tue, 17 Jan 2017 09:20:44 -0500
Subject: [PATCH] KEYCLOAK-4077

---
 .../src/main/java/org/keycloak/storage/UserStorageManager.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/src/main/java/org/keycloak/storage/UserStorageManager.java b/services/src/main/java/org/keycloak/storage/UserStorageManager.java
index cbb6018c691..1134b860714 100755
--- a/services/src/main/java/org/keycloak/storage/UserStorageManager.java
+++ b/services/src/main/java/org/keycloak/storage/UserStorageManager.java
@@ -301,6 +301,7 @@ public class UserStorageManager implements UserProvider, OnUserCache, OnCreateCo
             return importValidation(realm, user);
         }
         UserLookupProvider provider = (UserLookupProvider)getStorageProvider(session, realm, storageId.getProviderId());
+        if (provider == null) return null;
         return provider.getUserById(id, realm);
     }