diff --git a/ChangeLog b/ChangeLog
index 3e716975..de75fceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-07  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Print tags, possible values when OptionHandlerException is caught.
+	* src/option_processing.cc
+	
 2009-02-07  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Changed the message for FatalException.
diff --git a/src/option_processing.cc b/src/option_processing.cc
index 681c531f..4076c614 100644
--- a/src/option_processing.cc
+++ b/src/option_processing.cc
@@ -164,7 +164,7 @@ void option_processing(Option& op, std::deque<std::string>& uris,
   } catch(OptionHandlerException& e) {
     std::cerr << e.stackTrace() << "\n"
 	      << "Usage:" << "\n"
-	      << oparser.findByName(e.getOptionName())->getDescription()
+	      << oparser.findByName(e.getOptionName())
 	      << std::endl;
     exit(DownloadResult::UNKNOWN_ERROR);
   } catch(Exception& e) {