fixed nullpointer exception
Merge branch 'master' into toplevelcatch
added error page views
added annotations. next need to use annotations to test the error pages