If there is nothing in storage, the entire thing crashes and burns.. This fixes that