diff --git a/pom.xml b/pom.xml
index dc0e1d0..d1e8824 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>0.3.2</version>
+	<version>0.3.3</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/java/com/bwssystems/vera/VeraInfo.java b/src/main/java/com/bwssystems/vera/VeraInfo.java
index 9a261f4..666c3f0 100644
--- a/src/main/java/com/bwssystems/vera/VeraInfo.java
+++ b/src/main/java/com/bwssystems/vera/VeraInfo.java
@@ -72,7 +72,10 @@ public class VeraInfo {
 		Scene theScene = null;
 		while (theSecneIter.hasNext()) {
 			theScene = theSecneIter.next();
-			theScene.setRoom(roomMap.get(theScene.getRoom()).getName());
+			if(theScene.getRoom() != null && roomMap.get(theScene.getRoom()) != null)
+				theScene.setRoom(roomMap.get(theScene.getRoom()).getName());
+			else
+				theScene.setRoom("no room");
 		}
 	}