diff --git a/src/ui/static/resources/js/components/replication/create-policy.directive.js b/src/ui/static/resources/js/components/replication/create-policy.directive.js
index ae1e5c7bb..2072dce82 100644
--- a/src/ui/static/resources/js/components/replication/create-policy.directive.js
+++ b/src/ui/static/resources/js/components/replication/create-policy.directive.js
@@ -325,7 +325,12 @@
     }
     function pingDestinationFailed(data, status) {
       vm.pingAvailable = true;
-      vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + (data && data.length > 0 ? ':' + data : '');
+      if(status === 404) {
+        data = '';
+      }
+      vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + data;
+      console.log("Failed to ping target:" + data);
+      
       vm.pingTIP = false;
     }
   }
diff --git a/src/ui/static/resources/js/components/system-management/create-destination.directive.js b/src/ui/static/resources/js/components/system-management/create-destination.directive.js
index 0dfab3550..8adbe0fc6 100644
--- a/src/ui/static/resources/js/components/system-management/create-destination.directive.js
+++ b/src/ui/static/resources/js/components/system-management/create-destination.directive.js
@@ -163,7 +163,11 @@
     }
     function pingDestinationFailed(data, status) {
       vm.pingTIP = false;
-      vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + (data && data.length > 0 ? ':' + data : '');
+      if(status === 404) {
+        data = '';
+      }
+      vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + data;
+      console.log("Failed to ping target:" + data);
     }
   }