Return 404 for non-existent actions instead of 500

Return 404 for non-existent actions instead of 500 #36845