diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
index 9249f5e2d4..641db80b3a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -479,8 +479,12 @@ public class Gerrit implements EntryPoint {
     if (myAccount != null) {
       final AccountGeneralPreferences p = myAccount.getGeneralPreferences();
       CopyableLabel.setFlashEnabled(p.isUseFlashClipboard());
-      siteHeader.setVisible(p.isShowSiteHeader());
-      siteFooter.setVisible(p.isShowSiteHeader());
+      if (siteHeader != null) {
+        siteHeader.setVisible(p.isShowSiteHeader());
+      }
+      if (siteFooter != null) {
+        siteFooter.setVisible(p.isShowSiteHeader());
+      }
     }
   }