diff --git a/src/ccutil/elst.cpp b/src/ccutil/elst.cpp
index 3d743590684c6cfa8000bd0522df3261595246b4..36f2cf46844d08f214b657b70575292b75c52ba2 100644
--- a/src/ccutil/elst.cpp
+++ b/src/ccutil/elst.cpp
@@ -210,11 +210,13 @@ ELIST_LINK *ELIST_ITERATOR::forward() {
       cycle_pt = next;
     current = next;
   }
+#ifndef NDEBUG
+  if (!current)
+    NULL_DATA.error ("ELIST_ITERATOR::forward", ABORT, nullptr);
+#endif
   next = current->next;
 
   #ifndef NDEBUG
-  if (!current)
-    NULL_DATA.error ("ELIST_ITERATOR::forward", ABORT, nullptr);
   if (!next)
     NULL_NEXT.error ("ELIST_ITERATOR::forward", ABORT,
                      "This is: %p  Current is: %p", this, current);
diff --git a/src/training/stringrenderer.cpp b/src/training/stringrenderer.cpp
index 74fb004b3591464c42f644b1c0bef003f99041d3..2e4e9b5b96d84498918429e6f4e64642f0c5f31b 100644
--- a/src/training/stringrenderer.cpp
+++ b/src/training/stringrenderer.cpp
@@ -90,7 +90,8 @@ Pix* CairoARGB32ToPixFormat(cairo_surface_t *surface) {
 
 StringRenderer::StringRenderer(const std::string& font_desc, int page_width,
                                int page_height)
-    : page_width_(page_width),
+    : font_(font_desc),
+      page_width_(page_width),
       page_height_(page_height),
       h_margin_(50),
       v_margin_(50),
@@ -118,7 +119,6 @@ StringRenderer::StringRenderer(const std::string& font_desc, int page_width,
       total_chars_(0),
       font_index_(0),
       last_offset_(0) {
-  set_font(font_desc);
   set_resolution(kDefaultOutputResolution);
 }
 
diff --git a/src/viewer/svutil.cpp b/src/viewer/svutil.cpp
index 3868bc76e47ad1983cf53082ae99dc5232feaf03..99de09581fe6fab82ee4d8926bc7d7899b9d4e44 100644
--- a/src/viewer/svutil.cpp
+++ b/src/viewer/svutil.cpp
@@ -279,6 +279,8 @@ void SVNetwork::Close() {
 #else
   close(stream_);
 #endif
+  // Mark stream_ as invalid.
+  stream_ = -1;
 }
 
 
@@ -448,6 +450,7 @@ SVNetwork::SVNetwork(const char* hostname, int port) {
 }
 
 SVNetwork::~SVNetwork() {
+  Close();
   delete[] msg_buffer_in_;
 }