Add storage name to error message

TODO: add better error messages that actually say what the problem is.