Index: trunk/DataStoreServer/scripts/dsreg
===================================================================
--- trunk/DataStoreServer/scripts/dsreg	(revision 18842)
+++ trunk/DataStoreServer/scripts/dsreg	(revision 20288)
@@ -376,7 +376,10 @@
                             $ps0, $ps1, $ps2, $ps3, $ps4, $ps5, $ps6, $ps7));
 
-        die("failed to insert $fileset") if ($count == 0E0);
+        die("failed to insert $fileset") if (!defined($count) or ($count == 0E0));
 
         my $fileset_id = $dbh->last_insert_id(undef, undef, undef, undef);
+
+        die("last_insert_id returned undef") if (!defined($fileset_id));
+        die("last_insert_id returned 0") if (!$fileset_id);
 
         # make sure that no-one got in and created a fileset with this name while we were busy