App - Change: More work on error handler and general app