Add error handling if the storage fails
update importer to handle this