diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index 3808fa0271..1e079da598 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -1957,6 +1957,8 @@ bool Gui::addCombatReport(df::unit *unit, df::unit_report_type slot, df::report
     auto alert_type = announcement_alert_type::NONE;
     switch (slot)
     {
+        case unit_report_type::NONE: /* should never happen? */
+            return false;
         case unit_report_type::Combat:
             world->status.flags.bits.combat = true;
             alert_type = announcement_alert_type::COMBAT;
diff --git a/library/xml b/library/xml
index 145f317340..01c3774730 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 145f317340ac9327854318c7ba758ee2af5e1928
+Subproject commit 01c3774730e2c89b2a4a7894c03f43a91b8db0a7