diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/NodeFactory.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/NodeFactory.java
index b0b32a4..1350645 100644
--- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/NodeFactory.java
+++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/factory/NodeFactory.java
@@ -59,18 +59,20 @@ public class NodeFactory
             case Customer:
                 n = new Customer(startMoney);
                 break;
+            default:
         }
 
-        String[] subs = subsChannels.split(";");
-
-        for (String s : subs)
+        if (n != null)
         {
-            String[] el = s.split(" ");
+            String[] subs = subsChannels.split(";");
+            for (String s : subs)
+            {
+                String[] el = s.split(" ");
 
-            ChannelPool temp = FoodChain.getFactoryManager().getPoolDatabaseInstance().getChannelPoolInstance();
-            n.subscribeToChannel(temp.findByType(ProductType.valueOf(el[0])), ChannelSubscriptionType.valueOf(el[1]));
+                ChannelPool temp = FoodChain.getFactoryManager().getPoolDatabaseInstance().getChannelPoolInstance();
+                n.subscribeToChannel(temp.findByType(ProductType.valueOf(el[0])), ChannelSubscriptionType.valueOf(el[1]));
+            }
         }
-
         return n;
     }
 }