--- src/logic/expedition_bootstrap.cc.orig	2014-02-25 18:23:49.184906307 +0100
+++ src/logic/expedition_bootstrap.cc	2014-02-25 18:24:11.959906892 +0100
@@ -180,6 +180,7 @@
 		}
 	}
 	assert(false); // Never here, otherwise we do not have a queue for this ware.
+        return NULL;
 }
 
 std::vector<WaresQueue*> ExpeditionBootstrap::wares() const {
--- src/scripting/lua_map.cc.orig	2014-02-25 18:24:39.048907588 +0100
+++ src/scripting/lua_map.cc	2014-02-25 18:24:51.019907895 +0100
@@ -82,6 +82,7 @@
 			return CAST_TO_LUA(Ship);
 	}
 	assert(false);  // Never here, hopefully.
+        return 0;
 }
 int upcasted_immovable_to_lua(lua_State * L, BaseImmovable * mo) {
 	if (!mo)