Reverting slightly and adding in logging and errors for storage manager