diff --git a/vtkm/rendering/EncodePNG.cxx b/vtkm/rendering/EncodePNG.cxx
index fcd03f409..7485c4a77 100644
--- a/vtkm/rendering/EncodePNG.cxx
+++ b/vtkm/rendering/EncodePNG.cxx
@@ -28,12 +28,12 @@ vtkm::UInt32 EncodePNG(std::vector<unsigned char> const& image,
                        std::vector<unsigned char>& output_png)
 {
   // The default is 8 bit RGBA; does anyone care to have more options?
+  // We can certainly add them in a backwards-compatible way if need be.
   vtkm::UInt32 error = vtkm::png::lodepng::encode(output_png, image, width, height);
   if (error)
   {
-    // TODO: Use logging framework instead:
-    std::cerr << "PNG Encoder error number " << error << ": " << png::lodepng_error_text(error)
-              << "\n";
+    VTKM_LOG_S(vtkm::cont::LogLevel::Error,
+               "LodePNG Encoder error number " << error << ": " << png::lodepng_error_text(error));
   }
   return error;
 }
@@ -54,7 +54,8 @@ vtkm::UInt32 SavePNG(std::string const& filename,
 
   if (!ends_with(filename, ".png"))
   {
-    std::cerr << "PNG filename must end with .png\n";
+    VTKM_LOG_S(vtkm::cont::LogLevel::Error,
+               "File " << filename << " does not end with .png; this is required.");
   }
 
   std::vector<unsigned char> output_png;
diff --git a/vtkm/rendering/EncodePNG.h b/vtkm/rendering/EncodePNG.h
index c66d02cac..9e25dee1a 100644
--- a/vtkm/rendering/EncodePNG.h
+++ b/vtkm/rendering/EncodePNG.h
@@ -20,7 +20,6 @@ namespace vtkm
 namespace rendering
 {
 
-//
 VTKM_RENDERING_EXPORT
 vtkm::UInt32 EncodePNG(std::vector<unsigned char> const& image,
                        unsigned long width,