diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 40256c0..1427a19 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -117,7 +117,7 @@ public final class Startup extends Application {
 			logger.log(Level.INFO, "Saving local database and settings...");
 			localDB.save();
 			Settings.getInstance().save();
-			logger.log(Level.INFO, "Envoy was stopped as expected at " + new Date());
+			logger.log(Level.INFO, "Envoy was terminated by its user;
 		} catch (final Exception e) {
 			logger.log(Level.SEVERE, "Unable to save local files: ", e);
 		}
diff --git a/src/main/java/envoy/client/ui/controller/ChatScene.java b/src/main/java/envoy/client/ui/controller/ChatScene.java
index 5195b08..4dbca92 100644
--- a/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -292,7 +292,7 @@ public final class ChatScene {
 			if (!localDB.getIDGenerator().hasNext() && client.isOnline()) client.requestIdGenerator();
 
 		} catch (final IOException e) {
-			logger.log(Level.SEVERE, "Error sending message: ", e);
+			logger.log(Level.SEVERE, "Error while sending message: ", e);
 			new Alert(AlertType.ERROR, "An error occured while sending the message!").showAndWait();
 		}