diff --git a/root/etc/e-smith/events/actions/share-modify-scan b/root/etc/e-smith/events/actions/share-modify-scan
index 3970fb8..4b4dbbd 100644
--- a/root/etc/e-smith/events/actions/share-modify-scan
+++ b/root/etc/e-smith/events/actions/share-modify-scan
@@ -14,7 +14,7 @@ my $name = $ARGV [1];
 
 die "Event name missing\n" unless (defined $event);
 
-if ($event eq 'user-create'){
+if ($event eq 'user-create' and defined $name){
     mkpath "/home/e-smith/files/scan/$name";
     system ("$setfacl",
             '-m',
@@ -22,7 +22,7 @@ if ($event eq 'user-create'){
             '--',
             "/home/e-smith/files/scan/$name");
 }
-elsif ($event eq 'user-delete'){
+elsif ($event eq 'user-delete' and defined $name){
     rmtree "/home/e-smith/files/scan/$name";
 }
 else {