move nil catching fallbacks to the accessors