diff --git a/Aquaria/Game.cpp b/Aquaria/Game.cpp
index 1bf14b6..0b1b635 100644
--- a/Aquaria/Game.cpp
+++ b/Aquaria/Game.cpp
@@ -210,7 +210,6 @@ Game::Game() : StateObject()
 	controlHint_text = 0;
 
 	avatar = 0;
-	fromVel = Vector(0,-1);
 	deathTimer = 0;
 
 	game = this;
@@ -261,8 +260,6 @@ void Game::spawnManaBall(Vector pos, float a)
 void Game::warpPrep()
 {
 	avatar->onWarp();
-	fromVel = avatar->vel;
-	fromVel.setLength2D(10);
 	fromPosition = avatar->position;
 }
 
@@ -2934,7 +2931,7 @@ void Game::applyState()
 	bindInput();
 
 	if (verbose) debugLog("Loading Scene");
-	loadScene(sceneToLoad);
+	if(!loadScene(sceneToLoad))
 	{
 		debugLog("Failed to load scene [" + sceneToLoad + "]");
 	}
diff --git a/Aquaria/Game.h b/Aquaria/Game.h
index 99d592e..01c20cd 100644
--- a/Aquaria/Game.h
+++ b/Aquaria/Game.h
@@ -309,7 +309,6 @@ public:
 	std::string fromScene, toNode;
 	int toFlip;
 	char fromWarpType;
-	Vector fromVel;
 	void warpToSceneFromNode(Path *p);
 	Vector fromPosition;