diff --git a/src/psm/Util/Server/ServerValidator.php b/src/psm/Util/Server/ServerValidator.php
index 819e3e63..088c493a 100644
--- a/src/psm/Util/Server/ServerValidator.php
+++ b/src/psm/Util/Server/ServerValidator.php
@@ -93,18 +93,11 @@ class ServerValidator {
 				}
 				break;
 			case 'service':
-				if(
-					!filter_var($value, FILTER_VALIDATE_IP)
+			case 'ping':
+				if(!filter_var($value, FILTER_VALIDATE_IP)
 					// domain regex as per http://stackoverflow.com/questions/106179/regular-expression-to-match-hostname-or-ip-address :
 					&& !preg_match("/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])/", $value)
-				) {
-					throw new \InvalidArgumentException('server_ip_bad_service');
-				}
-				break;
-			case 'ping':
-				if(!filter_var($value, FILTER_VALIDATE_IP)) {
-					throw new \InvalidArgumentException('server_ip_bad_service');
-				}
+				){throw new \InvalidArgumentException('server_ip_bad_service');}
 				break;
 		}