Index: libedataserverui/e-passwords.c
===================================================================
--- libedataserverui/e-passwords.c	(revision 8457)
+++ libedataserverui/e-passwords.c	(working copy)
@@ -740,6 +740,19 @@ ep_get_password_keyfile (EPassMsg *msg)
 	if (password != NULL) {
 		msg->password = ep_password_decode (password);
 		g_free (password);
+
+	/* Not finding the requested key is acceptable, but we still
+	 * want to leave an informational message on the terminal. */
+	} else if (g_error_matches (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) {
+		g_message ("%s", error->message);
+		g_error_free (error);
+
+        /* Not finding the requested group is also acceptable. */
+        } else if (g_error_matches (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) {
+                g_message ("%s", error->message);
+                g_error_free (error);
+
+	/* Issue a warning if anything else goes wrong. */
 	} else if (error != NULL) {
 		g_warning ("%s", error->message);
 		g_error_free (error);
