correctly when using API key authentication * Along with the bugfixes, backported improved ErrorController from upstream branch, including style improvements.
Albert Santoni