Index: trunk/Nebulous-Server/lib/Nebulous/Key.pm
===================================================================
--- trunk/Nebulous-Server/lib/Nebulous/Key.pm	(revision 23932)
+++ trunk/Nebulous-Server/lib/Nebulous/Key.pm	(revision 24304)
@@ -27,5 +27,7 @@
 {
     my ($key, $volume) = @_;
-    return unless defined $key;
+
+    die "key param is not optional" unless defined $key;
+    die "too many params" if scalar @_ > 2;
 
     # white space is not allowed
