Fix for handling  of --init-storage fail