diff --git a/com.zsmartsystems.zigbee.console.main/src/main/java/com/zsmartsystems/zigbee/console/main/ZigBeeConsoleMain.java b/com.zsmartsystems.zigbee.console.main/src/main/java/com/zsmartsystems/zigbee/console/main/ZigBeeConsoleMain.java
index a8e9e410d..25cc195c6 100644
--- a/com.zsmartsystems.zigbee.console.main/src/main/java/com/zsmartsystems/zigbee/console/main/ZigBeeConsoleMain.java
+++ b/com.zsmartsystems.zigbee.console.main/src/main/java/com/zsmartsystems/zigbee/console/main/ZigBeeConsoleMain.java
@@ -332,10 +332,9 @@ public static void main(final String[] args) {
 
         // Initialise the network
         ZigBeeStatus initResponse = networkManager.initialize();
-        System.out.println("networkManager.initialize returned " + initResponse);
         if (initResponse != ZigBeeStatus.SUCCESS) {
-            console.start();
-            System.out.println("Console closed.");
+            networkManager.shutdown();
+            System.out.println("Console closed. networkManager.initialize returned " + initResponse);
             return;
         }
 
@@ -433,6 +432,8 @@ public static void main(final String[] args) {
 
         if (networkManager.startup(resetNetwork) != ZigBeeStatus.SUCCESS) {
             System.out.println("ZigBee console starting up ... [FAIL]");
+            networkManager.shutdown();
+            return;
         } else {
             System.out.println("ZigBee console starting up ... [OK]");
         }