diff --git a/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java b/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
index 077fce82..c9d495c5 100644
--- a/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
+++ b/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
@@ -19,6 +19,8 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
         String[] packageSplit = packageName.split("\\.");
         String version = packageSplit[packageSplit.length - 1];
 
+        saveDefaultConfig();
+
         try {
 
             this.compat = new CraftBukkit(this, version);
@@ -61,8 +63,6 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
             this.setEnabled(false);
         }
 
-        saveDefaultConfig();
-
         // thanks to the new config accessor code the config.saveDefaultConfig(); will now
         //  only copy the file if it doesnt exist!
     }
diff --git a/src/com/sekwah/advancedportals/listeners/Listeners.java b/src/com/sekwah/advancedportals/listeners/Listeners.java
index 2d529f1c..ec6e0aad 100644
--- a/src/com/sekwah/advancedportals/listeners/Listeners.java
+++ b/src/com/sekwah/advancedportals/listeners/Listeners.java
@@ -192,7 +192,7 @@ public class Listeners implements Listener {
 			catch(NullPointerException e){
 
 			}*/
-            if (event.getItem() != null && event.getPlayer().getItemInHand().getType() == WandMaterial // was type id
+            if (event.getPlayer().getItemInHand() != null && event.getPlayer().getItemInHand().getType() == WandMaterial // was type id
                     && (!UseOnlyServerAxe || (event.getItem().getItemMeta().getDisplayName() != null && event.getItem().getItemMeta().getDisplayName().equals("\u00A7ePortal Region Selector")))) {
 
                 // This checks if the action was a left or right click and if it was directly effecting a block.
@@ -226,14 +226,12 @@ public class Listeners implements Listener {
                     // Returns the event so no more code is executed(stops unnecessary code being executed)
                 }
 
-            }
-            else if(event.getItem() != null && event.getPlayer().getItemInHand().getItemMeta().getDisplayName().equals("\u00A75Portal Block Placer") &&
-                    event.getAction() == Action.LEFT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.PORTAL){
+            } else if (event.getPlayer().getItemInHand() != null && event.getPlayer().getItemInHand().getItemMeta().getDisplayName().equals("\u00A75Portal Block Placer") &&
+                    event.getAction() == Action.LEFT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.PORTAL) {
                 Block block = event.getClickedBlock();
-                if(block.getData() == 1){
+                if (block.getData() == 1) {
                     block.setData((byte) 2);
-                }
-                else{
+                } else {
                     block.setData((byte) 1);
                 }
                 event.setCancelled(true);
diff --git a/src/com/sekwah/advancedportals/portals/Portal.java b/src/com/sekwah/advancedportals/portals/Portal.java
index 947f3c70..56455b04 100644
--- a/src/com/sekwah/advancedportals/portals/Portal.java
+++ b/src/com/sekwah/advancedportals/portals/Portal.java
@@ -418,7 +418,7 @@ public class Portal {
             }
         } else {
             if (showFailMessage) {
-                player.sendMessage(PluginMessages.customPrefix + "\u00A7c The portal you are trying to use doesn't have a destination!");
+                player.sendMessage(PluginMessages.customPrefixFail + "\u00A7c The portal you are trying to use doesn't have a destination!");
                 plugin.getLogger().log(Level.SEVERE, "The portal '" + portal.portalName + "' has just had a warp "
                         + "attempt and either the data is corrupt or portal doesn't exist!");
                 throwPlayerBack(player);