added more error handling to evsy