diff --git a/db/Node.pm.in b/db/Node.pm.in
index 13491150273b08ba7366319d57ebeeb3be30f9a7..59eacde310e6f9b36a7294341ea9fcdae66448bf 100644
--- a/db/Node.pm.in
+++ b/db/Node.pm.in
@@ -1398,12 +1398,6 @@ sub CreateVnodes($$)
 	return -1;
     }
 
-    my $uuid = NewUUID();
-    if (!defined($uuid)) {
-	print STDERR "Could not generate a UUID!\n";
-	next NODE;
-    }
-    
     #
     # Assign however many we are told to (typically by assign). Locally
     # this is not a problem since nodes are not shared; assign always
@@ -1477,6 +1471,12 @@ sub CreateVnodes($$)
 	}
 	my $jailip = "${IPBASE1}.${pnet}.${pnode2}.${i}";
 
+	my $uuid = NewUUID();
+	if (!defined($uuid)) {
+	    print STDERR "Could not generate a UUID!\n";
+	    goto bad;
+	}
+
 	if ($verbose) {
 	    print STDERR "Jail IP for $vnodeid is $jailip\n";
 	    if ($impotent) {