Lightweight metadata load, remove pointless nil check