diff --git a/pom.xml b/pom.xml
index d665e12..fe86d5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.ryanhamshire</groupId>
     <artifactId>GriefPrevention</artifactId>
-    <version>15.3</version>
+    <version>15.3.1</version>
     <properties>
         <maven.compiler.source>1.6</maven.compiler.source>
         <maven.compiler.target>1.6</maven.compiler.target>
diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
index 122e3ee..1e6af1a 100644
--- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
+++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
@@ -280,6 +280,7 @@ public class GriefPrevention extends JavaPlugin
 			{
 				GriefPrevention.AddLogEntry("Because there was a problem with the database, GriefPrevention will not function properly.  Either update the database config settings resolve the issue, or delete those lines from your config.yml so that GriefPrevention can use the file system to store data.");
 				e.printStackTrace();
+				this.getServer().getPluginManager().disablePlugin(this);
 				return;
 			}			
 		}
diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
index 34cb03d..0a62641 100644
--- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
@@ -78,6 +78,13 @@ class PlayerEventHandler implements Listener
 {
 	private DataStore dataStore;
 	private GriefPrevention instance;
+
+	//typical constructor, yawn
+	PlayerEventHandler(DataStore dataStore, GriefPrevention plugin)
+	{
+		this.dataStore = dataStore;
+		this.instance = plugin;
+	}
 	
 	//list of temporarily banned ip's
 	private ArrayList<IpBanInfo> tempBannedIps = new ArrayList<IpBanInfo>();
@@ -97,13 +104,6 @@ class PlayerEventHandler implements Listener
 	//spam tracker
 	SpamDetector spamDetector = new SpamDetector();
 	
-	//typical constructor, yawn
-	PlayerEventHandler(DataStore dataStore, GriefPrevention plugin)
-	{
-		this.dataStore = dataStore;
-		this.instance = plugin;
-	}
-	
 	//when a player chats, monitor for spam
 	@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
 	synchronized void onPlayerChat (AsyncPlayerChatEvent event)