diff --git a/.travis.yml b/.travis.yml
index 6d4cc4bb7..77a2ea7ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ git:
 matrix:
   include:
     - os: osx
-      osx_image: xcode8.2
+      osx_image: xcode8.3
       env:
         - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7"
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb8871bd7..387d6855f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1253,7 +1253,7 @@ if( MSVC )
 	create_default_target_launcher( zdoom WORKING_DIRECTORY ${ZDOOM_OUTPUT_DIR} )
 endif()
 
-if( NOT WIN32 )
+if( NOT WIN32 AND NOT APPLE )
 	FILE( WRITE ${CMAKE_CURRENT_BINARY_DIR}/link-make "if [ ! -e ${ZDOOM_OUTPUT_DIR}/${ZDOOM_EXE_NAME} ]; then ln -sf ${CMAKE_CURRENT_BINARY_DIR}/${ZDOOM_EXE_NAME} ${ZDOOM_OUTPUT_DIR}/${ZDOOM_EXE_NAME}; fi" )
 	add_custom_command( TARGET zdoom POST_BUILD
 		COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/link-make
diff --git a/src/portal.cpp b/src/portal.cpp
index 9926f289e..0b74359a6 100644
--- a/src/portal.cpp
+++ b/src/portal.cpp
@@ -1027,8 +1027,17 @@ void P_CreateLinkedPortals()
 	{
 		if (linePortals[i].mType == PORTT_LINKED)
 		{
-			if (CollectSectors(id, linePortals[i].mOrigin->frontsector)) id++;
-			if (CollectSectors(id, linePortals[i].mDestination->frontsector)) id++;
+			if (linePortals[i].mDestination == nullptr)
+			{
+				Printf("Linked portal on line %d is unconnected and will be disabled\n", linePortals[i].mOrigin->Index());
+				linePortals[i].mOrigin->portalindex = UINT_MAX;
+				linePortals[i].mType = PORTT_VISUAL;
+			}
+			else
+			{
+				if (CollectSectors(id, linePortals[i].mOrigin->frontsector)) id++;
+				if (CollectSectors(id, linePortals[i].mDestination->frontsector)) id++;
+			}
 		}
 	}
 
diff --git a/src/sound/mididevices/music_fluidsynth_mididevice.cpp b/src/sound/mididevices/music_fluidsynth_mididevice.cpp
index 38c8eed22..07102c43d 100644
--- a/src/sound/mididevices/music_fluidsynth_mididevice.cpp
+++ b/src/sound/mididevices/music_fluidsynth_mididevice.cpp
@@ -526,14 +526,21 @@ int FluidSynthMIDIDevice::LoadPatchSets(const char *patches)
 		{
 			path = NicePath(tok);
 		}
-		if (FLUID_FAILED != fluid_synth_sfload(FluidSynth, path, count == 0))
+		if (FileExists(path))
 		{
-			DPrintf(DMSG_NOTIFY, "Loaded patch set %s.\n", tok);
-			count++;
+			if (FLUID_FAILED != fluid_synth_sfload(FluidSynth, path, count == 0))
+			{
+				DPrintf(DMSG_NOTIFY, "Loaded patch set %s.\n", tok);
+				count++;
+			}
+			else
+			{
+				DPrintf(DMSG_ERROR, "Failed to load patch set %s.\n", tok);
+			}
 		}
 		else
 		{
-			DPrintf(DMSG_ERROR, "Failed to load patch set %s.\n", tok);
+			DPrintf(DMSG_ERROR, "Could not find patch set %s.\n", tok);
 		}
 		tok = strtok(NULL, delim);
 	}
diff --git a/tools/updaterevision/updaterevision.c b/tools/updaterevision/updaterevision.c
index 7260f4131..bbb6dddf3 100644
--- a/tools/updaterevision/updaterevision.c
+++ b/tools/updaterevision/updaterevision.c
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 	// on a tag, it returns that tag. Otherwise it returns <most recent tag>-<number of
 	// commits since the tag>-<short hash>.
 	// Use git log to get the time of the latest commit in ISO 8601 format and its full hash.
-	stream = popen("git describe --tags && git log -1 --format=%ai*%H", "r");
+	stream = popen("git describe --tags --dirty=-m && git log -1 --format=%ai*%H", "r");
 
 	if (NULL != stream)
 	{