diff --git a/src/main/java/com/songoda/epicfarming/EpicFarming.java b/src/main/java/com/songoda/epicfarming/EpicFarming.java
index 95db539..2276a3a 100644
--- a/src/main/java/com/songoda/epicfarming/EpicFarming.java
+++ b/src/main/java/com/songoda/epicfarming/EpicFarming.java
@@ -134,9 +134,9 @@ public class EpicFarming extends SongodaPlugin {
                         items = configItems;
                     }
                     UUID placedBY = null;
-                    String configPlacedBY = row.get("placedby").asString();
-                    if (configPlacedBY != null) {
-                        placedBY = UUID.fromString(configPlacedBY);
+                    String configPlacedBy = row.get("placedby").asString();
+                    if (configPlacedBy != null) {
+                        placedBY = UUID.fromString(configPlacedBy);
                     }
                     Farm farm = new Farm(location, levelManager.getLevel(level), placedBY);
                     farm.setItems(items);
@@ -215,7 +215,7 @@ public class EpicFarming extends SongodaPlugin {
         for (String levelName : levelsFile.getKeys(false)) {
             ConfigurationSection levels = levelsFile.getConfigurationSection(levelName);
             
-            int level = Integer.valueOf(levelName.split("-")[1]);
+            int level = Integer.parseInt(levelName.split("-")[1]);
             int costExperiance = levels.getInt("Cost-xp");
             int costEconomy = levels.getInt("Cost-eco");
             int radius = levels.getInt("Radius");
diff --git a/src/main/java/com/songoda/epicfarming/storage/Storage.java b/src/main/java/com/songoda/epicfarming/storage/Storage.java
index d031c75..2825e6a 100644
--- a/src/main/java/com/songoda/epicfarming/storage/Storage.java
+++ b/src/main/java/com/songoda/epicfarming/storage/Storage.java
@@ -35,7 +35,7 @@ public abstract class Storage {
             String locstr = Methods.serializeLocation(farm.getLocation());
             prepareSaveItem("farms", new StorageItem("location", locstr),
                     new StorageItem("level", farm.getLevel().getLevel()),
-                    new StorageItem("placedby", farm.getPlacedBy().toString()),
+                    new StorageItem("placedby", farm.getPlacedBy() == null ? null : farm.getPlacedBy().toString()),
                     new StorageItem("contents", farm.getItems()));
         }