diff --git a/Mage.Client/release/sample-decks/Pro Walker.dck b/Mage.Client/release/sample-decks/Pro Walker.dck
index 16dfb6f5b05..0efd97bacd4 100644
Binary files a/Mage.Client/release/sample-decks/Pro Walker.dck and b/Mage.Client/release/sample-decks/Pro Walker.dck differ
diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml
index 23a34d273b1..0cf27cc657f 100644
--- a/Mage.Server/release/config/config.xml
+++ b/Mage.Server/release/config/config.xml
@@ -3,16 +3,16 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
 	<server serverAddress="localhost" serverName="mage-server" port="17171" maxGameThreads="10" maxSecondsIdle="600"/>
 	<playerTypes>
-		<playerType name="Human" jar="Mage.Player.Human.jar" className="mage.player.human.HumanPlayer"/>
-		<playerType name="Computer - default" jar="Mage.Player.AI.jar" className="mage.player.ai.ComputerPlayer"/>
-		<playerType name="Computer - minimax" jar="Mage.Player.AIMinimax.jar" className="mage.player.ai.ComputerPlayer2"/>
-		<playerType name="Computer - minimax hybrid" jar="Mage.Player.AIMinimax.jar" className="mage.player.ai.ComputerPlayer3"/>
+		<playerType name="Human" jar="Mage-Player-Human-0.5.jar" className="mage.player.human.HumanPlayer"/>
+		<playerType name="Computer - default" jar="Mage-Player-AI-0.5.jar" className="mage.player.ai.ComputerPlayer"/>
+		<playerType name="Computer - minimax" jar="Mage-Player-AIMinimax-0.5.jar" className="mage.player.ai.ComputerPlayer2"/>
+		<playerType name="Computer - minimax hybrid" jar="Mage-Player-AIMinimax-0.5.jar" className="mage.player.ai.ComputerPlayer3"/>
 	</playerTypes>
 	<gameTypes>
-		<gameType name="Two Player Duel" jar="Mage.Game.TwoPlayerDuel.jar" className="mage.game.TwoPlayerDuel" typeName="mage.game.TwoPlayerDuelType"/>
-		<gameType name="Free For All" jar="Mage.Game.FreeForAll.jar" className="mage.game.FreeForAll" typeName="mage.game.FreeForAllType"/>
+		<gameType name="Two Player Duel" jar="Mage-Game-TwoPlayerDuel-0.5.jar" className="mage.game.TwoPlayerDuel" typeName="mage.game.TwoPlayerDuelType"/>
+		<gameType name="Free For All" jar="Mage-Game-FreeForAll-0.5.jar" className="mage.game.FreeForAll" typeName="mage.game.FreeForAllType"/>
 	</gameTypes>
 	<deckTypes>
-		<deckType name="Constructed" jar="Mage.Deck.Constructed.jar" className="mage.deck.Constructed"/>
+		<deckType name="Constructed" jar="Mage-Deck-Constructed-0.5.jar" className="mage.deck.Constructed"/>
 	</deckTypes>
 </config>
diff --git a/Mage.Server/src/main/java/mage/server/Main.java b/Mage.Server/src/main/java/mage/server/Main.java
index 68342e59113..0aa19bd1bef 100644
--- a/Mage.Server/src/main/java/mage/server/Main.java
+++ b/Mage.Server/src/main/java/mage/server/Main.java
@@ -53,6 +53,7 @@ public class Main {
 
 	private final static String testModeArg = "-testMode=";
 	private final static String pluginFolder = "plugins";
+	private final static String version = "0.5";
 
 	public static PluginClassLoader classLoader = new PluginClassLoader();
 	public static ServerImpl server;
@@ -62,7 +63,7 @@ public class Main {
      */
     public static void main(String[] args) {
 
-		logger.info("Starting MAGE server version " + Main.class.getPackage().getImplementationVersion());
+		logger.info("Starting MAGE server version " + version);
 		logger.info("Logging level: " + Logging.getLevel(logger));
 		deleteSavedGames();
 		ConfigSettings config = ConfigSettings.getInstance();
diff --git a/Mage.Server/src/main/java/mage/server/ServerImpl.java b/Mage.Server/src/main/java/mage/server/ServerImpl.java
index c3cdefa65d2..22e2a562fb1 100644
--- a/Mage.Server/src/main/java/mage/server/ServerImpl.java
+++ b/Mage.Server/src/main/java/mage/server/ServerImpl.java
@@ -31,6 +31,7 @@ package mage.server;
 import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
+import java.rmi.server.ExportException;
 import java.rmi.server.RemoteServer;
 import java.rmi.server.UnicastRemoteObject;
 import java.util.List;
@@ -76,6 +77,8 @@ public class ServerImpl extends RemoteServer implements Server {
 			logger.info("Started MAGE server - listening on port " + port);
 			if (testMode)
 				logger.info("MAGE server running in test mode");
+		} catch (ExportException ex) {
+			logger.severe("ERROR:  Unable to start Mage Server - another server is likely running");
 		} catch (RemoteException ex) {
 			logger.log(Level.SEVERE, "Failed to start RMI server at port " + port, ex);
 		}
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java
index d96ead954e6..73948b07419 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SeaGateOracle.java
@@ -112,8 +112,10 @@ class SeaGateOracleEffect extends OneShotEffect<SeaGateOracleEffect> {
 				player.lookAtCards(cards, game);
 				player.choose(cards, target, game);
 				card = cards.get(target.getFirstTarget(), game);
-				card.moveToZone(Zone.HAND, source.getId(), game, false);
-				cards.remove(card);
+				if (card != null) {
+					card.moveToZone(Zone.HAND, source.getId(), game, false);
+					cards.remove(card);
+				}
 				for (Card card1: cards.getCards(game)) {
 					card1.moveToZone(Zone.LIBRARY, source.getId(), game, false);
 				}
diff --git a/Mage/src/mage/game/events/PlayerQueryEvent.java b/Mage/src/mage/game/events/PlayerQueryEvent.java
index 08281e159a4..5b000717860 100644
--- a/Mage/src/mage/game/events/PlayerQueryEvent.java
+++ b/Mage/src/mage/game/events/PlayerQueryEvent.java
@@ -113,7 +113,7 @@ public class PlayerQueryEvent extends EventObject implements ExternalEvent, Seri
 	}
 
 	public static PlayerQueryEvent lookEvent(UUID playerId, String message, Cards cards) {
-		return new PlayerQueryEvent(playerId, message, null, null, cards, null, QueryType.LOOK, 0, 0, false);
+		return new PlayerQueryEvent(playerId, message, null, null, null, cards, QueryType.LOOK, 0, 0, false);
 	}
 	
 	public String getMessage() {