Catching errors and painting them on screen
Merge branch 'master' into complete