Empty object id is now properly handled