diff --git a/include/exiv2/bmpimage.hpp b/include/exiv2/bmpimage.hpp
index abd0ccf549..3e93615ee5 100644
--- a/include/exiv2/bmpimage.hpp
+++ b/include/exiv2/bmpimage.hpp
@@ -79,16 +79,17 @@ namespace Exiv2 {
         //! @name Manipulators
         //@{
         void readMetadata() override;
-        /*!
-          @brief Todo: Write metadata back to the image. This method is not
-              yet(?) implemented. Calling it will throw an Error(kerWritingImageFormatUnsupported).
-         */
+
+        /// @throws Error(kerWritingImageFormatUnsupported).
         void writeMetadata() override;
 
+        /// @throws Error(kerInvalidSettingForImage)
         void setExifData(const ExifData& exifData) override;
 
+        /// @throws Error(kerInvalidSettingForImage)
         void setIptcData(const IptcData& iptcData) override;
 
+        /// @throws Error(kerInvalidSettingForImage)
         void setComment(const std::string& comment) override;
         //@}
 
@@ -96,7 +97,6 @@ namespace Exiv2 {
         //@{
         std::string mimeType() const override;
         //@}
-
     }; // class BmpImage
 
 // *****************************************************************************
diff --git a/src/bmpimage.cpp b/src/bmpimage.cpp
index d18979a71b..4c4bac982a 100644
--- a/src/bmpimage.cpp
+++ b/src/bmpimage.cpp
@@ -114,7 +114,7 @@ namespace Exiv2
 
     void BmpImage::writeMetadata()
     {
-        // Todo: implement me!
+        /// \todo implement me!
         throw(Error(kerWritingImageFormatUnsupported, "BMP"));
     }