WA refactoring, push exceptions downstream