Added error handling to asset service