Null storage behavior fix