diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index fed7364d7..1c3350359 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -117,6 +117,9 @@ class WP_User {
 	function WP_User($id) {
 		global $wp_roles, $table_prefix;
 
+		if ( empty($id) )
+			return;
+
 		if ( is_numeric($id) ) {
 			$this->data = get_userdata($id);
 		} else {
diff --git a/wp-includes/pluggable-functions.php b/wp-includes/pluggable-functions.php
index 7c267b031..4deb44a19 100644
--- a/wp-includes/pluggable-functions.php
+++ b/wp-includes/pluggable-functions.php
@@ -8,9 +8,10 @@ if ( !function_exists('get_currentuserinfo') ) :
 function get_currentuserinfo() {
 	global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity, $current_user;
 
-	if ( !isset($_COOKIE[USER_COOKIE])) 
+	if ( !isset($_COOKIE[USER_COOKIE])) {
+		$current_user = new WP_User(0);
 		return false;
-
+	}
 	$user_login  = $_COOKIE[USER_COOKIE];
 	$userdata    = get_userdatabylogin($user_login);
 	$user_level  = $userdata->user_level;