diff --git a/pom.xml b/pom.xml
index 196fa34a0..c51b50cc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,6 +230,12 @@
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
 			<version>${bukkitVersion}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>bungeecord-chat</artifactId>
+					<groupId>net.md-5</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- Attribute -->
@@ -300,6 +306,18 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>AllPay</artifactId>
+					<groupId>com.fernferret.allpay</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>Vault</artifactId>
+					<groupId>net.milkbowl.vault</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CommandHandler</artifactId>
+					<groupId>com.pneumaticraft.commandhandler</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -334,6 +352,62 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusHook</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusFactions-v1_6</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusCompat-v1_7_R3</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusFactions-v1_8</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusCompat-v1_7_R4</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusWG-v5</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusWG-v6</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusCompat-API</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusFactions-v2_6</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusCompat-v1_8_R3</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusFactions-v2_7</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusCompat-v1_8_R2</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>CombatTagPlusCompat-v1_8_R1</artifactId>
+					<groupId>net.minelink</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>metrics-lite</artifactId>
+					<groupId>org.mcstats.bukkit</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -368,12 +442,30 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>updater</artifactId>
+					<groupId>net.gravitydevelopment.updater</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>lombok</artifactId>
+					<groupId>org.projectlombok</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>EssentialsGroupManager</artifactId>
+					<groupId>net.ess3</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>PermissionsEx</artifactId>
+					<groupId>ru.tehkode</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>AccountsClient</artifactId>
+					<groupId>com.mojang</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
-		<!-- Local Dependencies -->
-
-		<!-- It doesn't have a Maven Repo, http://dev.bukkit.org/bukkit-plugins/chestshop/ -->
+		<!-- ChestShop, on our maven repo http://dev.bukkit.org/bukkit-plugins/chestshop/ -->
 		<dependency>
 			<groupId>com.acrobot.chestshop</groupId>
 			<artifactId>chestshop</artifactId>
@@ -387,6 +479,84 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>Vault</artifactId>
+					<groupId>net.milkbowl.vault</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>odditem</artifactId>
+					<groupId>info.somethingodd</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>scrollingmenusign</artifactId>
+					<groupId>me.desht</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>truezip</artifactId>
+					<groupId>de.schlichtherle</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>residence</artifactId>
+					<groupId>net.t00thpick1</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>Heroes</artifactId>
+					<groupId>com.herocraftonline.heroes</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>HeroChat</artifactId>
+					<groupId>com.dthielke.herochat</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>worldguard</artifactId>
+					<groupId>com.sk89q</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>worldedit</artifactId>
+					<groupId>com.sk89q</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>lwc</artifactId>
+					<groupId>com.griefcraft.lwc</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>js</artifactId>
+					<groupId>rhino</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jchronic</artifactId>
+					<groupId>com.sk89q</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>deadbolt</artifactId>
+					<groupId>com.daemitus.deadbolt</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>bukkit-classloader-check</artifactId>
+					<groupId>com.sk89q.spigot</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jsr305</artifactId>
+					<groupId>com.google.code.findbugs</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>opencsv</artifactId>
+					<groupId>net.sf.opencsv</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>simplechestlock</artifactId>
+					<groupId>
+						com.webkonsept.bukkit.simplechestlock
+					</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>commandbook</artifactId>
+					<groupId>com.sk89q</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>lockette</artifactId>
+					<groupId>org.yi.acru.bukkit.lockette</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 82697f2df..c86d9ecd1 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -775,6 +775,6 @@ public class AuthMe extends JavaPlugin {
             database = new CacheDataSource(this, database);
         }
 
-        database = new DatabaseCalls(this, database);
+        database = new DatabaseCalls(database);
     }
 }
diff --git a/src/main/java/fr/xephi/authme/SendMailSSL.java b/src/main/java/fr/xephi/authme/SendMailSSL.java
index 1927071f5..4a0c9dd84 100644
--- a/src/main/java/fr/xephi/authme/SendMailSSL.java
+++ b/src/main/java/fr/xephi/authme/SendMailSSL.java
@@ -82,7 +82,7 @@ public class SendMailSSL {
                     // Generate an image ?
                     File file = null;
                     if (Settings.generateImage) {
-                        ImageGenerator gen = new ImageGenerator(plugin, newPass);
+                        ImageGenerator gen = new ImageGenerator(newPass);
                         file = new File(plugin.getDataFolder() + File.separator + auth.getNickname() + "_new_pass.jpg");
                         ImageIO.write(gen.generateImage(), "jpg", file);
                         messageBodyPart = new MimeBodyPart();
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index ac1551de8..959830875 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -559,7 +559,7 @@ public class AuthMePlayerListener implements Listener {
         plugin.management.performJoin(player);
 
         // Remove the join message while the player isn't logging in
-        if (Settings.enableProtection || Settings.delayJoinMessage) {
+        if ((Settings.enableProtection || Settings.delayJoinMessage) && name != null && event.getJoinMessage() != null) {
             joinMessage.put(name, event.getJoinMessage());
             event.setJoinMessage(null);
         }