diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java
index 6e0b8b0..acb2e31 100644
--- a/src/main/java/net/minecraft/client/Minecraft.java
+++ b/src/main/java/net/minecraft/client/Minecraft.java
@@ -1261,7 +1261,7 @@ public class Minecraft implements IThreadListener {
 		this.mcProfiler.endStartSection("textures");
 		if (!this.isGamePaused) {
 			this.renderEngine.tick();
-			GlStateManager.viewport(0, 0, displayWidth, displayHeight); // to be safe
+			//GlStateManager.viewport(0, 0, displayWidth, displayHeight); // to be safe
 		}
 
 		if (this.currentScreen == null && this.thePlayer != null) {
diff --git a/src/main/java/net/minecraft/scoreboard/Scoreboard.java b/src/main/java/net/minecraft/scoreboard/Scoreboard.java
index 0256adc..f1314f4 100644
--- a/src/main/java/net/minecraft/scoreboard/Scoreboard.java
+++ b/src/main/java/net/minecraft/scoreboard/Scoreboard.java
@@ -258,13 +258,15 @@ public class Scoreboard {
 	 * memberships and broadcasts the deletion to all players
 	 */
 	public void removeTeam(ScorePlayerTeam parScorePlayerTeam) {
-		this.teams.remove(parScorePlayerTeam.getRegisteredName());
+		if(parScorePlayerTeam != null) {
+			this.teams.remove(parScorePlayerTeam.getRegisteredName());
 
-		for (String s : parScorePlayerTeam.getMembershipCollection()) {
-			this.teamMemberships.remove(s);
+			for (String s : parScorePlayerTeam.getMembershipCollection()) {
+				this.teamMemberships.remove(s);
+			}
+
+			this.func_96513_c(parScorePlayerTeam);
 		}
-
-		this.func_96513_c(parScorePlayerTeam);
 	}
 
 	/**+
@@ -303,13 +305,13 @@ public class Scoreboard {
 	 * is thrown.
 	 */
 	public void removePlayerFromTeam(String parString1, ScorePlayerTeam parScorePlayerTeam) {
-		if (this.getPlayersTeam(parString1) != parScorePlayerTeam) {
-			throw new IllegalStateException(
-					"Player is either on another team or not on any team. Cannot remove from team \'"
-							+ parScorePlayerTeam.getRegisteredName() + "\'.");
-		} else {
-			this.teamMemberships.remove(parString1);
-			parScorePlayerTeam.getMembershipCollection().remove(parString1);
+		if(parScorePlayerTeam != null) {
+			if (this.getPlayersTeam(parString1) != parScorePlayerTeam) {
+				throw new IllegalStateException("Player is either on another team or not on any team. Cannot remove from team \'" + parScorePlayerTeam.getRegisteredName() + "\'.");
+			} else {
+				this.teamMemberships.remove(parString1);
+				parScorePlayerTeam.getMembershipCollection().remove(parString1);
+			}
 		}
 	}