From 5727a01481e7680d330e2c45d2e52b9a124b16d6 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sun, 12 May 2013 16:54:35 +0200
Subject: [PATCH] fix NPE

---
 .../java/com/commafeed/frontend/pages/BasePage.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/commafeed/frontend/pages/BasePage.java b/src/main/java/com/commafeed/frontend/pages/BasePage.java
index 2588117e..21f2f221 100644
--- a/src/main/java/com/commafeed/frontend/pages/BasePage.java
+++ b/src/main/java/com/commafeed/frontend/pages/BasePage.java
@@ -73,12 +73,14 @@ public abstract class BasePage extends WebPage {
 		User user = CommaFeedSession.get().getUser();
 		if (user != null) {
 			UserSettings settings = userSettingsDAO.findByUser(user);
-			lang = settings.getLanguage() == null ? "en" : settings
-					.getLanguage();
+			if (settings != null) {
+				lang = settings.getLanguage() == null ? "en" : settings
+						.getLanguage();
+			}
 		}
 
-		add(new TransparentWebMarkupContainer("html").add(new AttributeModifier("lang",
-				lang)));
+		add(new TransparentWebMarkupContainer("html")
+				.add(new AttributeModifier("lang", lang)));
 
 		settings = applicationSettingsService.get();
 		add(new HeaderResponseContainer("footer-container", "footer-container"));