diff --git a/src/freedombone-app-ghost b/src/freedombone-app-ghost
index a5d1f9c8..86071c9e 100755
--- a/src/freedombone-app-ghost
+++ b/src/freedombone-app-ghost
@@ -319,6 +319,8 @@ function remove_ghost {
     rm /etc/systemd/system/ghost.service
     systemctl daemon-reload
 
+    npm uninstall -g ghost-cli
+
     function_check remove_nodejs
     remove_nodejs ghost
 
@@ -371,6 +373,10 @@ function install_ghost {
 
     # now install ghost itself
     npm install -g ghost-cli@1.4.1
+    if [ ! -f /usr/local/bin/ghost ]; then
+        echo $'ghost was not installed'
+        exit 738539
+    fi
 
     GHOST_ONION_HOSTNAME=$(add_onion_service ghost 80 ${GHOST_ONION_PORT})