Fix reload method and storage error handling