diff --git a/script/server b/script/server
index 5a773eded..2c93e6b0c 100755
--- a/script/server
+++ b/script/server
@@ -18,7 +18,7 @@ on_failure()
 {
   if [ $? != 0 ]
   then
-    fatal $1
+    fatal "$1"
   fi
 }
 
@@ -108,10 +108,8 @@ then
     branch=$(git branch | awk '/^[*]/ {print $2}')
     tar czf public/source.tar.gz  $(git ls-tree -r $branch | awk '{print $4}')
   else
-    fatal <<MSG
-Can't generate public/source.tar.gz for you. Please tar up a copy of
-your Diaspora installtion and place it there.
-MSG
+    fatal "Can't generate public/source.tar.gz for you.
+Please tar up a copy of your Diaspora installtion and place it there."
   fi
 fi
 
@@ -123,11 +121,10 @@ fi
 # Check if assets are precompiled
 if [ "$RAILS_ENV" = "production" -a ! -e "public/assets/default.css" ]
 then
-  fatal <<MSG
-You're running in production mode without having assets precompiled.
-Now and after each update before you restart the application, run:
-    bundle exec rake assets:precompile
-MSG
+  fatal "You're running in production mode without having assets
+precompiled. Now and after each update before you restart the
+application, run:
+    bundle exec rake assets:precompile"
 fi
 
 # Start Diaspora