diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 032d3473a8..bad6250df5 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -35,7 +35,9 @@ TokenizerException::TokenizerException(const std::string & msg, const std::strin
  * This tokenizer will break down a string into sub-strings (i.e words)
  * separated by the given separator characters.
  *
- * \sa LAMMPS_NS::ValueTokenizer TokenizerException */
+ * \exception TokenizerException
+ *
+ * \sa ValueTokenizer TokenizerException */
 
 Tokenizer::Tokenizer(const std::string & str, const std::string & separators) :
     text(str), separators(separators), start(0), ntokens(std::string::npos)
@@ -147,7 +149,7 @@ std::vector<std::string> Tokenizer::as_vector() {
 
 /*! Class for reading text with numbers
  *
- * \sa LAMMPS_NS::Tokenizer InvalidIntegerException InvalidFloatException */
+ * \sa Tokenizer InvalidIntegerException InvalidFloatException */
 
 ValueTokenizer::ValueTokenizer(const std::string & str, const std::string & separators) : tokens(str, separators) {
 }
diff --git a/src/tokenizer.h b/src/tokenizer.h
index fd034ddddb..688e6dcbbc 100644
--- a/src/tokenizer.h
+++ b/src/tokenizer.h
@@ -49,10 +49,10 @@ public:
     std::vector<std::string> as_vector();
 };
 
-/** \exception TokenizerException. Contains an error message string. */
 class TokenizerException : public std::exception {
   std::string message;
 public:
+  /** Thrown during retrieving or skipping tokens */
   TokenizerException(const std::string & msg, const std::string & token);
 
   ~TokenizerException() throw() {