diff --git a/update-record.py b/update-record.py
index 72330c4..b4a0260 100755
--- a/update-record.py
+++ b/update-record.py
@@ -8,6 +8,7 @@
 from configuration import get_account_data
 import argparse
 from getIPaddress import getPublicIP
+import sys, os
 
 
 def errorCheck(ret):
@@ -156,10 +157,19 @@
 	else:
 		try:
 			main(args)
-		except (NameError, RuntimeError, ValueError) as e:
+		except RuntimeError as e:
 			print(e.args[0])
+			sys.exit(os.EX_SOFTWARE)
+		except (NameError, ValueError) as e:
+			print(e.args[0])
+			sys.exit(os.EX_DATAERR)
+		except TimeoutError as e:
+			print('Timeout:', e)
+			sys.exit(os.EX_SOFTWARE)
 		# end try
 	# end if
+	
+	sys.exit(os.EX_OK)
 
 # end if