diff --git a/src/fuse_symlink.cpp b/src/fuse_symlink.cpp
index a2cbd367..2d2722d0 100644
--- a/src/fuse_symlink.cpp
+++ b/src/fuse_symlink.cpp
@@ -112,10 +112,14 @@ _symlink(const ugid_t          ugid_,
   rv = searchFunc_(branches_,newdirpath,existingbranches);
   if(rv < 0)
     return rv;
+  if(existingbranches.empty())
+    return -ENOENT;
 
   rv = createFunc_(branches_,newdirpath,newbranches);
   if(rv < 0)
     return rv;
+  if(newbranches.empty())
+    return -ENOENT;
 
   return ::_symlink_loop(ugid_,
                          existingbranches[0]->path,