diff --git a/chatto/src/main/java/org/ros/chatto/controller/Home.java b/chatto/src/main/java/org/ros/chatto/controller/Home.java
index 4291214..59e1d0f 100644
--- a/chatto/src/main/java/org/ros/chatto/controller/Home.java
+++ b/chatto/src/main/java/org/ros/chatto/controller/Home.java
@@ -26,7 +26,7 @@ public class Home {
 
 	@RequestMapping("/")
 	public String showPage(Model model, Principal principal) {
-		final String welcomeMessage = Optional.of(principal).map(p -> {
+		final String welcomeMessage = Optional.ofNullable(principal).map(p -> {
 			return String.format("Welcome back %s!", p.getName());
 		}).orElse("Welcome to chatto");
 		model.addAttribute("message", welcomeMessage);