use correct scope, and improve error messages