diff --git a/src/freedombone-app-turtl b/src/freedombone-app-turtl
index 9be525cd..ddf84bb4 100755
--- a/src/freedombone-app-turtl
+++ b/src/freedombone-app-turtl
@@ -442,6 +442,11 @@ __ENDCONFIG__
     # start the turtl server
     systemctl restart rethinkdb
 
+    if [ ! -f $TURTL_BASE_DIR/quicklisp/setup.lisp ]; then
+        echo $"$TURTL_BASE_DIR/quicklisp/setup.lisp was not found"
+        exit 6238234
+    fi
+
     echo '[Unit]' > /etc/systemd/system/turtl.service
     echo 'Description=Note taking service' >> /etc/systemd/system/turtl.service
     echo 'Documentation=http://turtl.it' >> /etc/systemd/system/turtl.service
diff --git a/src/freedombone-utils-database b/src/freedombone-utils-database
index ee61d02a..b0cd7126 100755
--- a/src/freedombone-utils-database
+++ b/src/freedombone-utils-database
@@ -361,12 +361,19 @@ function database_reinstall {
 }
 
 function install_rethinkdb {
+    if [[ "$(arch)" == "arm"* ]]; then
+        echo $'rethinkdb does not currently support ARM debian packages'
+        echo $"See http://download.rethinkdb.com/apt/dists/${DEBIAN_VERSION}/main"
+        exit 723723452
+    fi
+
     if [ ! -d $INSTALL_DIR ]; then
         mkdir -p $INSTALL_DIR
     fi
 
     cd $INSTALL_DIR
-    echo "deb http://download.rethinkdb.com/apt `lsb_release -cs` main" | tee /etc/apt/sources.list.d/rethinkdb.list
+
+    echo "deb http://download.rethinkdb.com/apt $DEBIAN_VERSION main" | tee /etc/apt/sources.list.d/rethinkdb.list
 
     wget -qO- https://download.rethinkdb.com/apt/pubkey.gpg | apt-key add -
     apt-get update