Much simplier and with is_null() sanity check