Improving code quality: Adding context to exception handlers
Improving code quality: starting to cope with the issue of 'System.out and System.err should not be used as loggers'
Merge branch 'merging'