diff --git a/apachesolr.admin.inc b/apachesolr.admin.inc
index f84d503..7148952 100644
--- a/apachesolr.admin.inc
+++ b/apachesolr.admin.inc
@@ -278,13 +278,11 @@ function apachesolr_environment_edit_validate(array $form, array &$form_state) {
     $pattern = empty($parts['user']) ? '@://[^:]+:([^/]+)@' : '#://[^@]+@[^:]+:([^/]+)#';
     preg_match($pattern, $form_state['values']['url'], $m);
     if (empty($m[1]) || !ctype_digit($m[1]) || $m[1] < 1 || $m[1] > 65535) {
-      form_set_error('port', t('The port has to be an integer between 1 and 65535.'));
-    }
-    else {
-      // Normalize the url by removing extra slashes and whitespace.
-      $form_state['values']['url'] = trim($form_state['values']['url'], "/ \t\r\n\0\x0B");
+      form_set_error('url', t('The port has to be an integer between 1 and 65535.'));
     }
   }
+  // Normalize the url by removing extra slashes and whitespace.
+  $form_state['values']['url'] = trim($form_state['values']['url'], "/ \t\r\n\0\x0B");
 }
 
 /**