diff --git a/docs/building.md b/docs/building.md
index eaeec0100..0de4e198a 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -15,6 +15,9 @@ video drivers for your card.
 
 Ensure Python is in your PATH (`C:\Python27\`).
 
+I recommend using [Cmder](http://bliker.github.io/cmder/) for git and command
+line usage.
+
 #### Debugging
 
 VS behaves oddly with the debug paths. Open the xenia-run project properties
diff --git a/src/xenia/kernel/xam_info.cc b/src/xenia/kernel/xam_info.cc
index 52efb89fd..2d848e539 100644
--- a/src/xenia/kernel/xam_info.cc
+++ b/src/xenia/kernel/xam_info.cc
@@ -83,6 +83,12 @@ SHIM_CALL XamLoaderGetLaunchData_shim(PPCContext* ppc_state,
   SHIM_SET_RETURN_64(0);
 }
 
+SHIM_CALL XamLoaderTerminateTitle_shim(PPCContext* ppc_state,
+                                       KernelState* state) {
+  XELOGD("XamLoaderTerminateTitle()");
+  assert_always();
+}
+
 SHIM_CALL XamEnumerate_shim(PPCContext* ppc_state, KernelState* state) {
   uint32_t handle = SHIM_GET_ARG_32(0);
   uint32_t zero = SHIM_GET_ARG_32(1);
@@ -127,6 +133,7 @@ void xe::kernel::xam::RegisterInfoExports(ExportResolver* export_resolver,
 
   SHIM_SET_MAPPING("xam.xex", XamLoaderGetLaunchDataSize, state);
   SHIM_SET_MAPPING("xam.xex", XamLoaderGetLaunchData, state);
+  SHIM_SET_MAPPING("xam.xex", XamLoaderTerminateTitle, state);
 
   SHIM_SET_MAPPING("xam.xex", XamEnumerate, state);
 }