Catch errors more liberally + formatting tweaks
Don't waste time generating programme map for 500 error pages (only 404)