Make it return 404 when appropriate