Guard against null storage