diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 3c665f0bd4..16148b206d 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -422,7 +422,7 @@ class WP_User {
 	 *
 	 * @since 2.0.0
 	 * @access private
-	 * @var array
+	 * @var object
 	 */
 	var $data;
 
@@ -521,13 +521,17 @@ class WP_User {
 			$id = 0;
 		}
 
-		if ( $id )
+		if ( $id ) {
 			$data = self::get_data_by( 'id', $id );
-		else
+		} else {
 			$data = self::get_data_by( 'login', $name );
+		}
 
-		if ( $data )
+		if ( $data ) {
 			$this->init( $data, $blog_id );
+		} else {
+			$this->data = new stdClass;
+		}
 	}
 
 	/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b0db8da773..cef1c3cb8b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31048';
+$wp_version = '4.2-alpha-31049';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.