Index: /trunk/Nebulous-Server/lib/Nebulous/Key.pm
===================================================================
--- /trunk/Nebulous-Server/lib/Nebulous/Key.pm	(revision 24305)
+++ /trunk/Nebulous-Server/lib/Nebulous/Key.pm	(revision 24306)
@@ -14,4 +14,5 @@
 use File::Spec;
 use URI::file;
+use Carp qw( croak );
 use URI;
 use overload '""' => \&_stringify_key;
@@ -28,10 +29,10 @@
     my ($key, $volume) = @_;
 
-    die "key param is not optional" unless defined $key;
-    die "too many params" if scalar @_ > 2;
+    croak "key param is not optional" unless defined $key;
+    croak "too many params" if scalar @_ > 2;
 
     # white space is not allowed
     if ($key =~ qr/\s+/) {
-        die "keys and URIs may not contain whitespace";
+        croak "keys and URIs may not contain whitespace";
     }
 
@@ -45,5 +46,5 @@
     if (defined $scheme) {
         # if so, does it use the neb scheme?
-        die "URI does not use the 'neb' scheme"
+        croak "URI does not use the 'neb' scheme"
             unless $scheme eq 'neb'; 
 
@@ -60,5 +61,5 @@
         # path component to it
         unless (length $path) {
-            die "neb URI scheme requires a path component"; 
+            croak "neb URI scheme requires a path component"; 
         }
         
@@ -75,5 +76,5 @@
         # require a leading slash if there is no volume name
         if ((not defined $volume_name) and (not $path =~ m|^/|)) {
-            die "neb URI scheme requires a leading slash, eg. neb:/";
+            croak "neb URI scheme requires a leading slash, eg. neb:/";
         }
     } else {