diff --git a/ChangeLog b/ChangeLog
index 7c8a17c6..7c04404c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Updated message when a path is not a file. Updated common message
+	for wrong option.
+	* src/OptionHandlerException.cc
+	* src/message.h
+
 2009-09-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Use File::isFile() instead of File::exists(). Updated message when
diff --git a/src/OptionHandlerException.cc b/src/OptionHandlerException.cc
index eb252e00..f1914f70 100644
--- a/src/OptionHandlerException.cc
+++ b/src/OptionHandlerException.cc
@@ -38,7 +38,7 @@
 namespace aria2 {
 
 const std::string OptionHandlerException::MESSAGE
-("Exception occurred while processing option %s:");
+("We encountered a problem while processing the option '--%s'.");
 
 OptionHandlerException::OptionHandlerException(const char* file, int line,
 					       const std::string& optName):
diff --git a/src/message.h b/src/message.h
index 763b1418..da337959 100644
--- a/src/message.h
+++ b/src/message.h
@@ -174,7 +174,7 @@
 #define MSG_GID_NOT_PROVIDED "GID is not provided."
 #define MSG_CANNOT_PARSE_XML_RPC_REQUEST "Failed to parse xml-rpc request."
 #define MSG_GOOD_BYE_SEEDER "Client is in seed state: Good Bye Seeder;)"
-#define MSG_NOT_FILE "'%s' is not a file."
+#define MSG_NOT_FILE "Is '%s' a regular file?"
 
 #define EX_TIME_OUT _("Timeout.")
 #define EX_INVALID_CHUNK_SIZE _("Invalid chunk size.")