diff --git a/src/main/java/org/nrg/xnat/security/XnatLogoutHandler.java b/src/main/java/org/nrg/xnat/security/XnatLogoutHandler.java
index e1e2f0c4a22296e7f109ab80797fe866a0e3ae70..e51fd586287fd1ada6cb97326ef3f8f00e5fa475 100644
--- a/src/main/java/org/nrg/xnat/security/XnatLogoutHandler.java
+++ b/src/main/java/org/nrg/xnat/security/XnatLogoutHandler.java
@@ -26,9 +26,11 @@ public class XnatLogoutHandler extends SecurityContextLogoutHandler implements L
         super.logout(request, response, authentication);
 
         //expire that guy here.
-        SessionInformation si = _registry.getSessionInformation(request.getSession().getId());
-        if (si!=null) {
-            si.expireNow();
+        if(_registry!=null) {
+            SessionInformation si = _registry.getSessionInformation(request.getSession().getId());
+            if (si != null) {
+                si.expireNow();
+            }
         }
 
     }