Fix error checking, reformat errors #167

Closed gdevenyi closed 6 years ago