diff --git a/modAionImpl/src/org/aion/zero/impl/sync/TaskImportBlocks.java b/modAionImpl/src/org/aion/zero/impl/sync/TaskImportBlocks.java
index 183ac12e1a..d75c5e43a4 100644
--- a/modAionImpl/src/org/aion/zero/impl/sync/TaskImportBlocks.java
+++ b/modAionImpl/src/org/aion/zero/impl/sync/TaskImportBlocks.java
@@ -28,6 +28,7 @@
 import org.aion.p2p.P2pConstant;
 import org.aion.util.types.ByteArrayWrapper;
 import org.aion.zero.impl.AionBlockchainImpl;
+import org.aion.zero.impl.SystemExitCodes;
 import org.aion.zero.impl.db.AionBlockStore;
 import org.aion.zero.impl.sync.PeerState.Mode;
 import org.aion.zero.impl.sync.statistics.BlockType;
@@ -269,8 +270,8 @@ private PeerState processBatch(PeerState givenState, List<Block> batch, String d
                 log.error("<import-block throw> ", e);
 
                 if (e.getMessage() != null && e.getMessage().contains("No space left on device")) {
-                    log.error("Shutdown due to lack of disk space.");
-                    System.exit(0);
+                    log.error("Shutdown due to lack of disk space.", e);
+                    System.exit(SystemExitCodes.OUT_OF_DISK_SPACE);
                 }
                 break;
             }
@@ -698,8 +699,8 @@ private int importFromStorage(PeerState state, long first, long last) {
                         log.error("<import-block throw> ", e);
                         if (e.getMessage() != null
                                 && e.getMessage().contains("No space left on device")) {
-                            log.error("Shutdown due to lack of disk space.");
-                            System.exit(0);
+                            log.error("Shutdown due to lack of disk space.", e);
+                            System.exit(SystemExitCodes.OUT_OF_DISK_SPACE);
                         }
                     }
                 }