Tidy up logic
Move parser error handling to main run method