diff --git a/src/libnsdb/fileserver.c b/src/libnsdb/fileserver.c
index a96078d15210..d98f97e369c3 100644
--- a/src/libnsdb/fileserver.c
+++ b/src/libnsdb/fileserver.c
@@ -1566,8 +1566,14 @@ nsdb_get_fsn_find_entry_s(nsdb_t host, const char *nce, const char *fsn_uuid,
 	ldap_msgfree(response);
 
 	if (retval == FEDFS_OK) {
-		xlog(D_CALL, "%s: returning fsn", __func__);
-		*fsn = tmp;
+		if (tmp == NULL) {
+			xlog(D_CALL, "%s: No FSN entries for FSN UUID %s",
+				__func__, fsn_uuid);
+			retval = FEDFS_ERR_NSDB_NOFSN;
+		} else {
+			xlog(D_CALL, "%s: returning fsn", __func__);
+			*fsn = tmp;
+		}
 	} else
 		nsdb_free_fedfs_fsn(tmp);
 	return retval;