Merge pull request #880 from t-gerhard/master

better exception page