diff --git a/app/models/gitolite_public_key.rb b/app/models/gitolite_public_key.rb
index 7a07c09eeec..46251cca346 100644
--- a/app/models/gitolite_public_key.rb
+++ b/app/models/gitolite_public_key.rb
@@ -205,6 +205,9 @@ def key_uniqueness
     return if !new_record?
 
     keypieces = key.match(/^(\S+)\s+(\S+)/)
+
+    return false if keypieces.nil?
+
     key_format = keypieces[1]
     key_data   = keypieces[2]