Minor cleanup.  Better error handling if you have an invalid config file.