diff --git a/hecl/driver/ToolExtract.hpp b/hecl/driver/ToolExtract.hpp
index 9538cb045..61509ef9c 100644
--- a/hecl/driver/ToolExtract.hpp
+++ b/hecl/driver/ToolExtract.hpp
@@ -205,7 +205,11 @@ public:
                 int width = HECL::ConsoleWidth();
                 int half = width / 2 - 2;
 
+                if (!message)
+                    message = _S("");
                 size_t messageLen = HECL::StrLen(message);
+                if (!submessage)
+                    submessage = _S("");
                 size_t submessageLen = HECL::StrLen(submessage);
                 if (half - messageLen < submessageLen-2)
                     submessageLen = 0;
diff --git a/hecl/extern/Athena b/hecl/extern/Athena
index 89fa92308..4ffce2dbc 160000
--- a/hecl/extern/Athena
+++ b/hecl/extern/Athena
@@ -1 +1 @@
-Subproject commit 89fa92308f6d2c8019a0e6202930aa721cba63bc
+Subproject commit 4ffce2dbc3a48ba1fc8142456630d584ab32ec57