Removed 404 redirection, added error messages instead