diff --git a/desktop/piecannon b/desktop/piecannon
index a0358dd..00989be 100755
--- a/desktop/piecannon
+++ b/desktop/piecannon
@@ -10,11 +10,11 @@ echo $STUB_POM > $STUB_POM_FILE
 
 OUTPUT=$(mvn -f $STUB_POM_FILE -B exec:java -Dexec.mainClass=$PC_CLASS -Dexec.arguments=$1 -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN)
 EXEC_RESULT=$?
-echo $OUTPUT
+echo "$OUTPUT"
 
-if [ $EXEC_RESULT ]; then
+if [ $EXEC_RESULT != 0 ]; then
     exit $EXEC_RESULT;
 fi
 
-RESULT=$(echo $OUTPUT | tail -n 1)
+RESULT=$(echo "$OUTPUT" | tail -n 1)
 xdg-open $RESULT