Added custom 404 handling