Updated the Error controller
Merge branch 'master' of github.com:Tyil/freemwurk
Latest updates, made from another project