Tightened up error handling in asset store