diff --git a/scripts/uninstall b/scripts/uninstall
index c826059..ddb6439 100755
--- a/scripts/uninstall
+++ b/scripts/uninstall
@@ -8,12 +8,15 @@ fuzzy_match=`ls $GVM_ROOT/gos | sort | grep "$1" | head -n 1 | grep "$1"` ||
 	display_error "Invalid version $1"
 
 if [ -d $GVM_ROOT/gos/$fuzzy_match ]; then
-  rm -rf $GVM_ROOT/gos/$fuzzy_match
-  rm -rf $GVM_ROOT/pkgsets/$fuzzy_match
-	rm -f $GVM_ROOT/environments/$fuzzy_match
-	rm -f "$GVM_ROOT/environments/$fuzzy_match@"*
-  echo "Uninstalled version $fuzzy_match"
+	rm -rf $GVM_ROOT/pkgsets/$fuzzy_match &> /dev/null ||
+		display_error "Couldn't remove pkgsets"
+	rm -f $GVM_ROOT/environments/$fuzzy_match &> /dev/null ||
+		display_error "Couldn't remove environment files"
+	rm -f "$GVM_ROOT/environments/$fuzzy_match@"* &> /dev/null ||
+		display_error "Couldn't remove pkgset environment files"
+	rm -rf $GVM_ROOT/gos/$fuzzy_match &> /dev/null ||
+		display_error "Couldn't remove Go folder"
+	echo "Uninstalled version $fuzzy_match"
 else
-  display_error "Invalid version"
+	display_error "Invalid version"
 fi
-