diff --git a/scratchbox2/pathmapping/pathmapping_interf.c b/scratchbox2/pathmapping/pathmapping_interf.c
index fdc0c90c..c1c1a622 100644
--- a/scratchbox2/pathmapping/pathmapping_interf.c
+++ b/scratchbox2/pathmapping/pathmapping_interf.c
@@ -249,6 +249,9 @@ void sbox_map_path_at(
 		res->mres_readonly = 1;
 		return;
 	}
+        if (*virtual_path == '\0') {
+		goto end;
+	}
 
 	if ((*virtual_path == '/')
 #ifdef AT_FDCWD
@@ -287,6 +290,7 @@ void sbox_map_path_at(
 		return;
 	}
 
+end:
 	/* name not found. Can't do much here, log a warning and return
 	 * the original relative path. That will work if we are lucky, but
 	 * not always..  */