Index: tests/phpunit/tests/query.php
===================================================================
--- tests/phpunit/tests/query.php	(revision 35929)
+++ tests/phpunit/tests/query.php	(working copy)
@@ -492,4 +492,19 @@
 
 		$this->assertContains( 'LIMIT 5, 5', $q->request );
 	}
+
+	/**
+	 * @ticket 35013
+	 */
+	public function test_clone_fatal_error_on_admin_404() {
+		global $wp_query, $wp;
+
+		// Some awesome hacking on the query
+		$wp_query->is_singular = true;
+		set_current_screen( 'edit.php' );
+
+		// This should not trigger a Fatal Error
+		$wp->handle_404();
+
+	}
 }