Support getting an entityID as an Option instead of it throwing an exception.