Turns out @storage isn't nil, despite it working fine in all of the original testing. So also check for an empty hash