Merge pull request #9 from thunderwolf/master

Exception in dev env when only prod is set
Merge pull request #10 from thunderwolf/master

404, 500 and other Errors
Merge remote-tracking branch 'amg-dev/master'