--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Activator.java	Thu Jul 29 09:51:07 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Activator.java	Thu Jul 29 13:28:20 2010 -0500
@@ -62,10 +62,13 @@
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
 	public void start(BundleContext context) throws Exception {
+		plugin = this;
 		super.start(context);
 		IProxyData proxyData = ProxyUtils.getProxyData(new URI("http://www.yahoo.com")); //$NON-NLS-1$
-		System.setProperty(PROPERTY_PROXYHOST, proxyData.getHost());
-		System.setProperty(PROPERTY_PROXYPORT, String.valueOf(proxyData.getPort()));
+		if (proxyData != null) {
+			System.setProperty(PROPERTY_PROXYHOST, proxyData.getHost());
+			System.setProperty(PROPERTY_PROXYPORT, String.valueOf(proxyData.getPort()));
+		}
 	}
 
 	/*