added new error handling to e2e and app