Improved App.config
Improved error handling