diff --git a/AK/Format.h b/AK/Format.h
index ddd612968d7..b9b69ca15bf 100644
--- a/AK/Format.h
+++ b/AK/Format.h
@@ -395,6 +395,8 @@ template<>
 struct Formatter<Bytes> : Formatter<ReadonlyBytes> {
 };
 
+// FIXME: Printing raw char pointers is inherently dangerous. Remove this and
+//        its users and prefer StringView over it.
 template<>
 struct Formatter<char const*> : Formatter<StringView> {
     ErrorOr<void> format(FormatBuilder& builder, char const* value)
@@ -403,7 +405,8 @@ struct Formatter<char const*> : Formatter<StringView> {
             Formatter<FlatPtr> formatter { *this };
             return formatter.format(builder, reinterpret_cast<FlatPtr>(value));
         }
-        return Formatter<StringView>::format(builder, value);
+
+        return Formatter<StringView>::format(builder, value != nullptr ? StringView { value, __builtin_strlen(value) } : "(null)"sv);
     }
 };
 template<>
diff --git a/Userland/Libraries/LibCore/ArgsParser.cpp b/Userland/Libraries/LibCore/ArgsParser.cpp
index 021e83924f0..ead8ed09252 100644
--- a/Userland/Libraries/LibCore/ArgsParser.cpp
+++ b/Userland/Libraries/LibCore/ArgsParser.cpp
@@ -275,8 +275,12 @@ void ArgsParser::print_usage_markdown(FILE* file, char const* argv0)
     for (auto& opt : m_options) {
         if (opt.hide_mode != OptionHideMode::None)
             continue;
+
+        // FIXME: We allow opt.value_name to be empty even if the option
+        //        requires an argument. This should be disallowed as it will
+        //        currently display a blank name after the option.
         if (opt.requires_argument)
-            out(file, " [{} {}]", opt.name_for_display(), opt.value_name);
+            out(file, " [{} {}]", opt.name_for_display(), opt.value_name ?: "");
         else
             out(file, " [{}]", opt.name_for_display());
     }