Index: src/wp-includes/ms-load.php
===================================================================
--- src/wp-includes/ms-load.php	(revision 27383)
+++ src/wp-includes/ms-load.php	(working copy)
@@ -394,9 +394,12 @@
  *
  * @access private
  * @since 3.0.0
+ *
+ * @param string $domain The requested domain for the error to reference.
+ * @param string $path   The requested path for the error to reference.
  */
-function ms_not_installed() {
-	global $wpdb, $domain, $path;
+function ms_not_installed( $domain, $path ) {
+	global $wpdb;
 
 	wp_load_translations_early();
 
Index: src/wp-includes/ms-settings.php
===================================================================
--- src/wp-includes/ms-settings.php	(revision 27383)
+++ src/wp-includes/ms-settings.php	(working copy)
@@ -77,7 +77,7 @@
 				$current_site = wp_get_network( $one_network );
 				wp_cache_set( 'current_network', 'site-options' );
 			} elseif ( 0 === $wpdb->num_rows ) {
-				ms_not_installed();
+				ms_not_installed( $domain, $path );
 			}
 		}
 		if ( empty( $current_site ) ) {
@@ -85,7 +85,7 @@
 		}
 
 		if ( empty( $current_site ) ) {
-			ms_not_installed();
+			ms_not_installed( $domain, $path );
 		} elseif ( $path === $current_site->path ) {
 			$current_blog = get_site_by_path( $domain, $path );
 		} else {
@@ -110,7 +110,7 @@
 
 	// If we don't have a network by now, we have a problem.
 	if ( empty( $current_site ) ) {
-		ms_not_installed();
+		ms_not_installed( $domain, $path );
 	}
 
 	// @todo What if the domain of the network doesn't match the current site?
@@ -154,7 +154,7 @@
 				header( 'Location: http://' . $current_site->domain . $current_site->path );
 				exit;
 			}
-			ms_not_installed();
+			ms_not_installed( $domain, $path );
 		}
 	}