diff --git a/src/main/java/org/nrg/xnat/services/XnatAppInfo.java b/src/main/java/org/nrg/xnat/services/XnatAppInfo.java
index cf3290213e78a6f5c4272811fedfd77c763b4c27..f0ad26b674d6a8684cbb3b3723414fd53f0ce5ba 100644
--- a/src/main/java/org/nrg/xnat/services/XnatAppInfo.java
+++ b/src/main/java/org/nrg/xnat/services/XnatAppInfo.java
@@ -169,16 +169,21 @@ public class XnatAppInfo {
                         _log.info("The site was not flagged as initialized and initialized preference set to false. Setting system for initialization.");
                     }
                     for (String pref : _foundPreferences.keySet()) {
-                        _template.update(
-                                "UPDATE xhbm_preference SET value = ? WHERE name = ?",
-                                new Object[]{_foundPreferences.get(pref), pref}, new int[]{Types.VARCHAR, Types.VARCHAR}
-                                        );
-                        try {
-                            XDAT.getSiteConfigPreferences().set(_foundPreferences.get(pref), pref);
-                        } catch (InvalidPreferenceName e) {
-                            _log.error("", e);
-                        } catch (NullPointerException e) {
-                            _log.error("Error getting site config preferences.", e);
+                        if(_foundPreferences.get(pref)!=null) {
+                            _template.update(
+                                    "UPDATE xhbm_preference SET value = ? WHERE name = ?",
+                                    new Object[]{_foundPreferences.get(pref), pref}, new int[]{Types.VARCHAR, Types.VARCHAR}
+                            );
+                            try {
+                                XDAT.getSiteConfigPreferences().set(_foundPreferences.get(pref), pref);
+                            } catch (InvalidPreferenceName e) {
+                                _log.error("", e);
+                            } catch (NullPointerException e) {
+                                _log.error("Error getting site config preferences.", e);
+                            }
+                        }
+                        else{
+                            _log.warn("Preference "+pref+" was null.");
                         }
                     }
                 }