X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/MySQLPreferencePage.java b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/MySQLPreferencePage.java
index 11875a3..d5a662f 100644
--- a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/MySQLPreferencePage.java
+++ b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/MySQLPreferencePage.java
@@ -26,8 +26,10 @@ public class MySQLPreferencePage extends PreferencePage implements
 
 	public MySQLPreferencePage() {
 		super();
-		setPreferenceStore(ExternalToolsPlugin.getDefault()
-				.getPreferenceStore());
+
+        if (ExternalToolsPlugin.getDefault () != null) {
+            setPreferenceStore (ExternalToolsPlugin.getDefault().getPreferenceStore());
+        }
 	}
 
 	protected Control createContents(Composite parent) {
@@ -40,7 +42,7 @@ public class MySQLPreferencePage extends PreferencePage implements
 				ExternalToolsPlugin.MYSQL_START_BACKGROUND,
 				PHPPreferencesMessages
 						.getString("PHPBasePreferencePage.mySQLGroup.start_background"),
-						composite);
+				composite);
 		mysqlStartBFE.setPage(this);
 		mysqlStartBFE.setPreferenceStore(getPreferenceStore());
 		mysqlStartBFE.load();
@@ -50,7 +52,7 @@ public class MySQLPreferencePage extends PreferencePage implements
 		mySQLCommandSFE = new StringFieldEditor(ExternalToolsPlugin.MYSQL_PREF,
 				PHPPreferencesMessages
 						.getString("PHPBasePreferencePage.mySQLGroup.command"),
-						composite);
+				composite);
 		mySQLCommandSFE.setPage(this);
 		mySQLCommandSFE.setPreferenceStore(getPreferenceStore());
 		mySQLCommandSFE.load();
@@ -59,7 +61,7 @@ public class MySQLPreferencePage extends PreferencePage implements
 		mysqlRunFFE = new FileFieldEditor(ExternalToolsPlugin.MYSQL_RUN_PREF,
 				PHPPreferencesMessages
 						.getString("PHPBasePreferencePage.mySQLGroup.run"),
-						composite);
+				composite);
 		mysqlRunFFE.setPage(this);
 		mysqlRunFFE.setPreferenceStore(getPreferenceStore());
 		mysqlRunFFE.load();