Index: wp-includes/plugin.php
===================================================================
--- wp-includes/plugin.php	(revision 17501)
+++ wp-includes/plugin.php	(working copy)
@@ -667,9 +667,15 @@
 	// The option should not be autoloaded, because it is not needed in most
 	// cases. Emphasis should be put on using the 'uninstall.php' way of
 	// uninstalling the plugin.
-	$uninstallable_plugins = (array) get_option('uninstall_plugins');
-	$uninstallable_plugins[plugin_basename($file)] = $callback;
-	update_option('uninstall_plugins', $uninstallable_plugins);
+	$uninstallable_plugins = get_option('uninstall_plugins');
+	if ( false === $uninstallable_plugins )
+		$uninstallable_plugins = array( plugin_basename($file) => $callback );
+		add_option( 'uninstall_plugins', $uninstallable_plugins, '', 'no' );
+	} else {
+		$uninstallable_plugins = (array) $uninstallable_plugins;
+		$uninstallable_plugins[plugin_basename($file)] = $callback;
+		update_option( 'uninstall_plugins', $uninstallable_plugins );
+	}
 }
 
 /**
