Changed 404 handler to return 404 status code