modified errorhandler; more storagemanager work