From 768db3d75762442aa659ee420fb502db5e5db500 Mon Sep 17 00:00:00 2001
From: Nejc Zdovc <NejcZdovc@users.noreply.github.com>
Date: Sun, 20 Nov 2016 13:38:24 +0100
Subject: [PATCH] Fixed null problem (#162)

Closes #157
---
 src/config-serializer/config-items/Module.ts            | 6 +++++-
 src/config-serializer/config-items/key-action/helper.ts | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/config-serializer/config-items/Module.ts b/src/config-serializer/config-items/Module.ts
index 1065a92d..05b052cc 100644
--- a/src/config-serializer/config-items/Module.ts
+++ b/src/config-serializer/config-items/Module.ts
@@ -50,7 +50,11 @@ export class Module extends Serializable<Module> {
         return {
             id: this.id,
             pointerRole: PointerRole[this.pointerRole],
-            keyActions: this.keyActions.map(keyAction => keyAction.toJsObject())
+            keyActions: this.keyActions.map(keyAction => {
+                if (keyAction) {
+                    return keyAction.toJsObject();
+                }
+            })
         };
     }
 
diff --git a/src/config-serializer/config-items/key-action/helper.ts b/src/config-serializer/config-items/key-action/helper.ts
index ce5e9125..aac29338 100644
--- a/src/config-serializer/config-items/key-action/helper.ts
+++ b/src/config-serializer/config-items/key-action/helper.ts
@@ -66,6 +66,10 @@ export class Helper {
     }
 
     private static fromJSONObject(keyAction: any): KeyAction {
+        if (!keyAction) {
+            return;
+        }
+
         switch (keyAction.keyActionType) {
             case keyActionType.NoneAction:
                 return new NoneAction().fromJsObject(keyAction);