diff --git a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
index 8d37cbf7..1289de14 100644
--- a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
+++ b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
@@ -27,6 +27,11 @@ public class CacheDataSource extends Thread implements DataSource {
         	cache.put(auth.getNickname(), auth);
     }
 
+    public void run()
+    {
+    	this.setName("AuthMeCacheThread");
+    }
+
     @Override
     public synchronized boolean isAuthAvailable(String user) {
         if (cache.containsKey(user.toLowerCase()))
diff --git a/src/main/java/fr/xephi/authme/datasource/FlatFileThread.java b/src/main/java/fr/xephi/authme/datasource/FlatFileThread.java
index ce5ef47a..262a64bf 100644
--- a/src/main/java/fr/xephi/authme/datasource/FlatFileThread.java
+++ b/src/main/java/fr/xephi/authme/datasource/FlatFileThread.java
@@ -48,6 +48,7 @@ public class FlatFileThread extends Thread implements DataSource {
                 AuthMe.getInstance().getServer().getPluginManager().disablePlugin(AuthMe.getInstance());
             return;
         }
+        this.setName("AuthMeFlatFileThread");
     }
 
     @Override
diff --git a/src/main/java/fr/xephi/authme/datasource/MySQLThread.java b/src/main/java/fr/xephi/authme/datasource/MySQLThread.java
index 393a91f4..36dafcfb 100644
--- a/src/main/java/fr/xephi/authme/datasource/MySQLThread.java
+++ b/src/main/java/fr/xephi/authme/datasource/MySQLThread.java
@@ -94,10 +94,11 @@ public class MySQLThread extends Thread implements DataSource {
                 AuthMe.getInstance().getServer().getPluginManager().disablePlugin(AuthMe.getInstance());
             return;
         }
+        this.setName("AuthMeMySQLThread");
     }
 
     private synchronized void connect() throws ClassNotFoundException,
-            SQLException, TimeoutException {
+            SQLException, TimeoutException, NumberFormatException {
         Class.forName("com.mysql.jdbc.Driver");
         ConsoleLogger.info("MySQL driver loaded");
         MysqlConnectionPoolDataSource dataSource = new MysqlConnectionPoolDataSource();
diff --git a/src/main/java/fr/xephi/authme/datasource/SQLiteThread.java b/src/main/java/fr/xephi/authme/datasource/SQLiteThread.java
index b7289341..ce8363dd 100644
--- a/src/main/java/fr/xephi/authme/datasource/SQLiteThread.java
+++ b/src/main/java/fr/xephi/authme/datasource/SQLiteThread.java
@@ -72,6 +72,7 @@ public class SQLiteThread extends Thread implements DataSource {
                 AuthMe.getInstance().getServer().getPluginManager().disablePlugin(AuthMe.getInstance());
             return;
         }
+        this.setName("AuthMeSQLiteThread");
     }
 
     private synchronized void connect() throws ClassNotFoundException,
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index c0786b7d..b1c0b681 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -1177,7 +1177,8 @@ public class AuthMePlayerListener implements Listener {
             } catch (NullPointerException npe) {
             }
         }
-        event.setRespawnLocation(spawn);
+        if (spawn != null && spawn.getWorld() != null)
+        	event.setRespawnLocation(spawn);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)