Fixes for getter throwing exceptions when they should be returning null.