Better errorhandling in controllers
Merge remote-tracking branch 'origin/doomnight' into doomnight