diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx
index a732847..cf4f31b 100644
--- a/vncviewer/CConn.cxx
+++ b/vncviewer/CConn.cxx
@@ -430,15 +430,15 @@
 
   if (!Decoder::supported(encoding)) {
     // TRANSLATORS: Refers to a VNC protocol encoding type
-    vlog.error(_("Unknown rect encoding %d"), encoding);
-    throw Exception(_("Unknown rect encoding"));
+    vlog.error(_("Unknown encoding %d"), encoding);
+    throw Exception(_("Unknown encoding"));
   }
 
   if (!decoders[encoding]) {
     decoders[encoding] = Decoder::createDecoder(encoding, this);
     if (!decoders[encoding]) {
-      vlog.error(_("Unknown rect encoding %d"), encoding);
-      throw Exception(_("Unknown rect encoding"));
+      vlog.error(_("Unknown encoding %d"), encoding);
+      throw Exception(_("Unknown encoding"));
     }
   }
   decoders[encoding]->readRect(r, desktop->getFramebuffer());
diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
index bf4bfb1..7fb712a 100644
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -113,7 +113,7 @@
 {
   // CleanupSignalHandler allows C++ object cleanup to happen because it calls
   // exit() rather than the default which is to abort.
-  vlog.info(_("CleanupSignalHandler called"));
+  vlog.info(_("Termination signal %d has been received. TigerVNC Viewer will now exit."), sig);
   exit(1);
 }