slag down third-party storage registrar
error handling refactoring