diff --git a/whm/gniza-whm/remotes.cgi b/whm/gniza-whm/remotes.cgi
index a226393..ccd86fe 100644
--- a/whm/gniza-whm/remotes.cgi
+++ b/whm/gniza-whm/remotes.cgi
@@ -72,6 +72,9 @@ sub handle_test_connection {
             $err =~ s/\\/\\\\/g;
             $err =~ s/"/\\"/g;
             $err =~ s/\n/\\n/g;
+            $err =~ s/\r/\\r/g;
+            $err =~ s/\t/\\t/g;
+            $err =~ s/[\x00-\x1f]//g;
             print qq({"success":false,"message":"SSH connection failed: $err"});
         }
     }
@@ -111,6 +114,9 @@ sub handle_test_connection {
             $err =~ s/\\/\\\\/g;
             $err =~ s/"/\\"/g;
             $err =~ s/\n/\\n/g;
+            $err =~ s/\r/\\r/g;
+            $err =~ s/\t/\\t/g;
+            $err =~ s/[\x00-\x1f]//g;
             print qq({"success":false,"message":"Connection failed: $err"});
         }
     }
diff --git a/whm/gniza-whm/setup.cgi b/whm/gniza-whm/setup.cgi
index 03acb58..fe8546d 100644
--- a/whm/gniza-whm/setup.cgi
+++ b/whm/gniza-whm/setup.cgi
@@ -48,6 +48,9 @@ sub handle_test_connection {
         $err =~ s/\\/\\\\/g;
         $err =~ s/"/\\"/g;
         $err =~ s/\n/\\n/g;
+        $err =~ s/\r/\\r/g;
+        $err =~ s/\t/\\t/g;
+        $err =~ s/[\x00-\x1f]//g;
         print qq({"success":false,"message":"SSH connection failed: $err"});
     }
     exit;