BUGFIX 404 handling was breaking on 3.1 sites