diff --git a/slapos/grid/slapgrid.py b/slapos/grid/slapgrid.py
index 622a09e3f70d2cd8b29abfe032b6a5fbe34f7c6c..5d5b38e4aef13a82a46bc5bea61c38c4a29c5c6f 100644
--- a/slapos/grid/slapgrid.py
+++ b/slapos/grid/slapgrid.py
@@ -337,7 +337,7 @@ class Slapgrid(object):
       computer_partition_list = self.computer.getComputerPartitionList()
     except socket.error as error:
       self.logger.fatal(error)
-      sys.exit(1)
+      raise
     return computer_partition_list
 
   def processSoftwareReleaseList(self):