2 files changed, 4 insertions, 2 deletions
diff --git a/src/encoder.hpp b/src/encoder.hpp
index 995802f..0d5b6ba 100644
--- a/src/encoder.hpp
+++ b/src/encoder.hpp
@@ -52,7 +52,7 @@ namespace zmq
 
         //  The destructor doesn't have to be virtual. It is mad virtual
         //  just to keep ICC and code checking tools from complaining.
-        inline ~encoder_t ()
+        inline virtual ~encoder_t ()
         {
             free (buf);
         }
diff --git a/src/uuid.cpp b/src/uuid.cpp
index 406bbb4..f1dddf0 100644
--- a/src/uuid.cpp
+++ b/src/uuid.cpp
@@ -190,8 +190,10 @@ unsigned char zmq::uuid_t::convert_byte (const char *hexa_)
         byte = *hexa_ - 'A' + 10;
     else if (*hexa_ >= 'a' && *hexa_ <= 'f')
         byte = *hexa_ - 'a' + 10;
-    else
+    else {
         zmq_assert (false);
+        byte = 0;
+    }
 
     byte *= 16;