Added some error handling to the storage server