diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index f35ba3fe8e790af377b200c82c28f4a9db65e181..e09a46f6dd2fb122f0641736d981df6ccf4ba82e 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -174,7 +174,7 @@ void
 save(Extension *key, SPDocument *doc, gchar const *filename, bool check_overwrite, bool official,
     Inkscape::Extension::FileSaveMethod save_method)
 {
-    Output *omod;
+    Output *omod = nullptr;
     if (key == nullptr) {
         DB::OutputList o;
         for (auto mod : db.get_output_list(o)) {
diff --git a/src/file.cpp b/src/file.cpp
index 067fc7f961dd087943c29e5f7bb5fa1b6f487dc0..d399bc39daeee64e702dfdff57845d93731c5b91 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -262,7 +262,7 @@ file_save(Gtk::Window &parentWindow,
                                   checkoverwrite, official,
                                   save_method);
     } catch (Inkscape::Extension::Output::no_extension_found &e) {
-        gchar *text = g_strdup_printf(_("No Inkscape extension found to save document (%s).  This may have been caused by an unknown filename extension."), display_name.c_str());
+        gchar *text = g_strdup_printf(_("No Inkscape extension found to save document (%s).  This may have been caused by an unknown or missing filename extension."), display_name.c_str());
         SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Document not saved."));
         sp_ui_error_dialog(text);
         g_free(text);