Updates for some error handling