Add NOT_FOUND error processing and fix default catalog.html page view.
Merge remote-tracking branch 'origin/master'