diff --git a/FFXIVClassic Map Server/CommandProcessor.cs b/FFXIVClassic Map Server/CommandProcessor.cs
index 6cebd662..50985884 100644
--- a/FFXIVClassic Map Server/CommandProcessor.cs	
+++ b/FFXIVClassic Map Server/CommandProcessor.cs	
@@ -88,7 +88,7 @@ namespace FFXIVClassic_Map_Server
             if (cmd.Any())
             {
                 // if client isnt null, take player to be the player actor
-                var player = client.GetActor();
+                var player = client?.GetActor();
 
                 if (cmd.Equals("help"))
                 {
diff --git a/FFXIVClassic Map Server/NLog.config b/FFXIVClassic Map Server/NLog.config
index cad2eea9..a59613ac 100644
--- a/FFXIVClassic Map Server/NLog.config	
+++ b/FFXIVClassic Map Server/NLog.config	
@@ -53,6 +53,7 @@
     <!-- add your logging rules here -->
     <logger name='*' minlevel='Trace' writeTo='file' />
     <logger name='FFXIVClassic_Map_Server.Program' minlevel='Trace' writeTo='console' />
+    <logger name='FFXIVClassic_Map_Server.lua.*' minlevel='Trace' writeTo='console' />
     <logger name='FFXIVClassic_Map_Server.packets.*' minlevel='Debug' writeTo='packets' />
     <!--
     Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
diff --git a/FFXIVClassic Map Server/WorldManager.cs b/FFXIVClassic Map Server/WorldManager.cs
index f0c87fde..2c1fcfa5 100644
--- a/FFXIVClassic Map Server/WorldManager.cs	
+++ b/FFXIVClassic Map Server/WorldManager.cs	
@@ -360,12 +360,10 @@ namespace FFXIVClassic_Map_Server
         //Moves actor to new zone, and sends packets to spawn at the given coords.
         public void DoZoneChange(Player player, uint destinationZoneId, string destinationPrivateArea, byte spawnType, float spawnX, float spawnY, float spawnZ, float spawnRotation)
         {
-            Area oldZone;
-
+            Area oldZone = player.zone;
             //Remove player from currentZone if transfer else it's login
             if (player.zone != null)
             {
-                oldZone = player.zone;
                 oldZone.RemoveActorFromZone(player);
             }
 
@@ -376,9 +374,20 @@ namespace FFXIVClassic_Map_Server
                 newArea = GetZone(destinationZoneId);
             else
                 newArea = GetZone(destinationZoneId).GetPrivateArea(destinationPrivateArea, 0);
+
             //This server does not contain that zoneId
             if (newArea == null)
+            {
+                if (oldZone != null)
+                {
+                    oldZone.AddActorToZone(player);
+                }
+
+                var message = "WorldManager.DoZoneChange: unable to change areas, new area is not valid.";
+                player.SendMessage(SendMessagePacket.MESSAGE_TYPE_SYSTEM, "[Debug]", message);
+                Program.Log.Debug(message);
                 return;
+            }
 
             newArea.AddActorToZone(player);
 
diff --git a/data/scripts/commands/gm/warp.lua b/data/scripts/commands/gm/warp.lua
index 4fa2c2b9..4652a0c6 100644
--- a/data/scripts/commands/gm/warp.lua
+++ b/data/scripts/commands/gm/warp.lua
@@ -7,7 +7,7 @@ properties = {
 [[
 <zone> |
 <zone> <x> <y> <z> |
-<x> <y> <z> <zone> <privateArea> <target name>.
+<zone> <x> <y> <z> <privateArea> <target name>.
 ]],
 }
 
diff --git a/sql/gamedata_achievements.sql b/sql/gamedata_achievements.sql
index 8faa28a1..e8832429 100644
--- a/sql/gamedata_achievements.sql
+++ b/sql/gamedata_achievements.sql
@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_achievements`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_achievements`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -795,4 +797,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:49
diff --git a/sql/gamedata_actor_appearance.sql b/sql/gamedata_actor_appearance.sql
index 546d03f3..1eafae41 100644
--- a/sql/gamedata_actor_appearance.sql
+++ b/sql/gamedata_actor_appearance.sql
@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_actor_appearance`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_actor_appearance`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -7916,4 +7918,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:50
diff --git a/sql/gamedata_actor_class.sql b/sql/gamedata_actor_class.sql
index 7348e548..6f7104ce 100644
--- a/sql/gamedata_actor_class.sql
+++ b/sql/gamedata_actor_class.sql
@@ -8,6 +8,8 @@ Date: 6/21/2016 10:49:37 PM
 */
 
 SET FOREIGN_KEY_CHECKS=0;
+SET autocommit = 0;
+
 -- ----------------------------
 -- Table structure for gamedata_actor_class
 -- ----------------------------
@@ -8006,3 +8008,5 @@ INSERT INTO `gamedata_actor_class` VALUES ('9220405', '', '2', null);
 INSERT INTO `gamedata_actor_class` VALUES ('9220406', '', '2', null);
 INSERT INTO `gamedata_actor_class` VALUES ('9220407', '', '2', null);
 INSERT INTO `gamedata_actor_class` VALUES ('9220408', '', '2', null);
+
+COMMIT;
diff --git a/sql/gamedata_items.sql b/sql/gamedata_items.sql
index 4137f198..1d3a36e3 100644
--- a/sql/gamedata_items.sql
+++ b/sql/gamedata_items.sql
@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_items`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_items`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -8476,4 +8478,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:51
diff --git a/sql/gamedata_items_accessory.sql b/sql/gamedata_items_accessory.sql
index 62eb06f0..a29c2d7c 100644
--- a/sql/gamedata_items_accessory.sql
+++ b/sql/gamedata_items_accessory.sql
@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_items_accessory`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_items_accessory`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -326,4 +328,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:51
diff --git a/sql/gamedata_items_armor.sql b/sql/gamedata_items_armor.sql
index 8d951a83..9b6a3f81 100644
--- a/sql/gamedata_items_armor.sql
+++ b/sql/gamedata_items_armor.sql
@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_items_armor`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_items_armor`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
diff --git a/sql/gamedata_items_equipment.sql b/sql/gamedata_items_equipment.sql
index b16b83a1..80c9cef2 100644
--- a/sql/gamedata_items_equipment.sql
+++ b/sql/gamedata_items_equipment.sql
@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_items_equipment`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_items_equipment`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -4946,4 +4948,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:52
diff --git a/sql/gamedata_items_graphics.sql b/sql/gamedata_items_graphics.sql
index dfc5ac32..e857767f 100644
--- a/sql/gamedata_items_graphics.sql
+++ b/sql/gamedata_items_graphics.sql
@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_items_graphics`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_items_graphics`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -144,4 +146,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:52
diff --git a/sql/gamedata_items_weapon.sql b/sql/gamedata_items_weapon.sql
index 7aca2c7f..ea5d07bd 100644
--- a/sql/gamedata_items_weapon.sql
+++ b/sql/gamedata_items_weapon.sql
@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_items_weapon`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_items_weapon`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1230,4 +1232,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:52
diff --git a/sql/import.sh b/sql/import.sh
index 4022144c..a26f768b 100644
--- a/sql/import.sh
+++ b/sql/import.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-IMPORT_PATH=C:/repositories/ffxiv-classic-server/sql/
+IMPORT_PATH="C://coding//repositories//ffxiv related//ffxivclassic//ffxiv-classic-server//sql//"
 USER=root
 PASS=root
 DBNAME=ffxiv_server
@@ -8,14 +8,18 @@ ECHO Creating Database $DBNAME
 mysqladmin -h localhost -u $USER -p$PASS DROP $DBNAME
 
 ECHO Creating Database $DBNAME
-mysqladmin -h localhost -u $USER -p$PASS CREATE $DBNAME
+mysqladmin -h localhost -u $USER -p$PASS CREATE $DBNAME IF NOT EXISTS $DBNAME
 
 ECHO Loading $DBNAME tables into the database
-cd $IMPORT_PATH
-for X in *.sql;
-do 
-	echo Importing $X;
-	"C:\program files\mysql\mysql server 5.7\bin\mysql" $DBNAME -h localhost -u $USER -p$PASS < $X
+sh cd $IMPORT_PATH
+
+for X in '*.sql';
+do
+	for Y in $X
+	do
+		echo Importing $Y;
+		"C:\program files\mysql\mysql server 5.7\bin\mysql" $DBNAME -h localhost -u $USER -p$PASS < $Y
+	done
 done
 
 ECHO Finished!
\ No newline at end of file