diff --git a/Zway/Devices/CommandClasses/Alarm.cs b/Zway/Devices/CommandClasses/Alarm.cs
index 33cef64..52d1705 100644
--- a/Zway/Devices/CommandClasses/Alarm.cs
+++ b/Zway/Devices/CommandClasses/Alarm.cs
@@ -31,11 +31,19 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
     }
 
     private void InitComplex(JsonData json) {
-      if (json.Keys.Contains("data") && json["data"].Keys.Contains("V1event") && 
-        json["data"]["V1event"].Keys.Contains("alarmType") && json["data"]["V1event"]["alarmType"].Keys.Contains("value") &&
-        json["data"]["V1event"].Keys.Contains("level") && json["data"]["V1event"]["level"].Keys.Contains("value")) {
-        this.AlarmType = Int32.Parse(json["data"]["V1event"]["alarmType"]["value"].ToString());
-        this.Level = Int32.Parse(json["data"]["V1event"]["level"]["value"].ToString());
+      if (json.Keys.Contains("data") && json["data"].Keys.Contains("V1event")) {
+        if(json["data"]["V1event"].Keys.Contains("alarmType") && 
+          json["data"]["V1event"]["alarmType"].Keys.Contains("value") &&
+          json["data"]["V1event"]["alarmType"]["value"] != null &&
+          json["data"]["V1event"]["alarmType"]["value"].IsInt) {
+          this.AlarmType = Int32.Parse(json["data"]["V1event"]["alarmType"]["value"].ToString());
+        }
+        if(json["data"]["V1event"].Keys.Contains("level") && 
+          json["data"]["V1event"]["level"].Keys.Contains("value") &&
+          json["data"]["V1event"]["level"]["value"] != null &&
+          json["data"]["V1event"]["level"]["value"].IsInt) {
+          this.Level = Int32.Parse(json["data"]["V1event"]["level"]["value"].ToString());
+        }
       }
     }
     #endregion
diff --git a/Zway/Properties/AssemblyInfo.cs b/Zway/Properties/AssemblyInfo.cs
index fd97e1f..29dfbfe 100644
--- a/Zway/Properties/AssemblyInfo.cs
+++ b/Zway/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0")]
-[assembly: AssemblyFileVersion("1.5.0")]
+[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyFileVersion("1.5.1")]
diff --git a/Zway/bin/Release/Zway.dll b/Zway/bin/Release/Zway.dll
index 41321df..485503b 100644
Binary files a/Zway/bin/Release/Zway.dll and b/Zway/bin/Release/Zway.dll differ