Fix error handling
Test runev and error handling