diff --git a/src/com/projectkorra/ProjectKorra/ProjectKorra.java b/src/com/projectkorra/ProjectKorra/ProjectKorra.java
index f2596dc2..e1262e83 100644
--- a/src/com/projectkorra/ProjectKorra/ProjectKorra.java
+++ b/src/com/projectkorra/ProjectKorra/ProjectKorra.java
@@ -40,7 +40,7 @@ public class ProjectKorra extends JavaPlugin {
 		    if (!logFolder.exists()) {
 		        logFolder.mkdirs();
 		    }
-		    handler = new PKLogHandler(getDataFolder() + File.separator + "ERROR.log");
+		    handler = new PKLogHandler(logFolder + File.separator + "ERROR.%g.log");
 			log.getParent().addHandler(handler);
 		} catch (SecurityException | IOException e) {
 			e.printStackTrace();
diff --git a/src/com/projectkorra/ProjectKorra/Utilities/logging/LogFilter.java b/src/com/projectkorra/ProjectKorra/Utilities/logging/LogFilter.java
index 1ab77dba..cd65e9f6 100644
--- a/src/com/projectkorra/ProjectKorra/Utilities/logging/LogFilter.java
+++ b/src/com/projectkorra/ProjectKorra/Utilities/logging/LogFilter.java
@@ -29,17 +29,17 @@ public class LogFilter implements Filter {
 		}
 		String recordString = "";
 		if (record.getMessage() != null) {
-			if (!record.getMessage().contains("LogTest")) {
+			if (!record.getMessage().contains("ProjectKorra")) {
 				if (record.getThrown() == null) {
 					return false;
 				}
 				if (record.getThrown().getMessage() == null) {
 					return false;
 				}
-				if (!record.getThrown().getMessage().contains("LogTest")) {
+				if (!record.getThrown().getMessage().contains("ProjectKorra")) {
 					return false;
 				}
-				// record message doesnt have logtest but throwable does
+				// record message doesnt have ProjectKorra but throwable does
 			} 
 			recordString = buildString(record);
 		} else {
@@ -47,10 +47,10 @@ public class LogFilter implements Filter {
 				if (record.getThrown().getMessage() == null) {
 					return false;
 				}
-				if (!record.getThrown().getMessage().contains("LogTest")) {
+				if (!record.getThrown().getMessage().contains("ProjectKorra")) {
 					return false;
 				}
-				// record message null but throwable has logtest
+				// record message null but throwable has ProjectKorra
 				recordString = buildString(record);
 			}
 		}
diff --git a/src/com/projectkorra/ProjectKorra/airbending/AirCombo.java b/src/com/projectkorra/ProjectKorra/airbending/AirCombo.java
index 0addfc7a..c2659699 100644
--- a/src/com/projectkorra/ProjectKorra/airbending/AirCombo.java
+++ b/src/com/projectkorra/ProjectKorra/airbending/AirCombo.java
@@ -529,7 +529,7 @@ public class AirCombo {
 					&& combo.ability.equalsIgnoreCase("AirSweep")) {
 				for (int j = 0; j < combo.tasks.size(); j++) {
 					FireComboStream fs = (FireComboStream) combo.tasks.get(j);
-					if (fs.getLocation() != null
+					if (fs.getLocation() != null && fs.getLocation().getWorld().equals(loc.getWorld())
 							&& Math.abs(fs.getLocation().distance(loc)) <= radius) {
 						fs.remove();
 						removed = true;
diff --git a/src/com/projectkorra/ProjectKorra/waterbending/WaterWave.java b/src/com/projectkorra/ProjectKorra/waterbending/WaterWave.java
index 80c030a4..993cb6a8 100644
--- a/src/com/projectkorra/ProjectKorra/waterbending/WaterWave.java
+++ b/src/com/projectkorra/ProjectKorra/waterbending/WaterWave.java
@@ -15,6 +15,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
+import com.projectkorra.ProjectKorra.BendingPlayer;
 import com.projectkorra.ProjectKorra.GeneralMethods;
 import com.projectkorra.ProjectKorra.ProjectKorra;
 import com.projectkorra.ProjectKorra.TempBlock;
@@ -305,7 +306,10 @@ public class WaterWave {
 
 	public void remove() {
 		instances.remove(this);
-		GeneralMethods.getBendingPlayer(player.getName()).addCooldown("WaterWave", cooldown);
+		BendingPlayer bPlayer = GeneralMethods.getBendingPlayer(player.getName());
+		if (bPlayer != null) {
+		    bPlayer.addCooldown("WaterWave", cooldown);
+		}
 		revertBlocks();
 		for (BukkitRunnable task : tasks)
 			task.cancel();