Improve stacktraces and error messages during expansion