diff --git a/libagent/gpg/__init__.py b/libagent/gpg/__init__.py
index 7513f18..d4ca9ad 100644
--- a/libagent/gpg/__init__.py
+++ b/libagent/gpg/__init__.py
@@ -127,8 +127,9 @@ def run_init(device_type, args):
     log.info('GPG home directory: %s', homedir)
 
     if os.path.exists(homedir):
-        log.error('GPG home directory exists, remove it manually if required')
-        exit(1)
+        log.error('GPG home directory %s exists, '
+                  'remove it manually if required', homedir)
+        sys.exit(1)
 
     check_call(['mkdir', '-p', homedir])
     check_call(['chmod', '700', homedir])