Index: trunk/DataStoreServer/scripts/dsreg
===================================================================
--- trunk/DataStoreServer/scripts/dsreg	(revision 30455)
+++ trunk/DataStoreServer/scripts/dsreg	(revision 35389)
@@ -236,7 +236,7 @@
     $dbh->disconnect();
 
-    if ($remove) {
+    if ($remove and -e $fileset_dir) {
         my $rc;
-        if (($rc = system "rm -r $fileset_dir")) {
+        if (($rc = system "rm -rf $fileset_dir")) {
             &my_die("failed to remove $fileset_dir error code: $rc", $PS_EXIT_UNKNOWN_ERROR);
         }