diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc
index ee704a6b9d..84e69b6d7b 100644
--- a/src/logging/Manager.cc
+++ b/src/logging/Manager.cc
@@ -1511,9 +1511,6 @@ threading::Value Manager::ValToLogVal(WriterInfo* info, const Stream* stream, st
                 info->total_truncated_string_fields->Inc();
             }
 
-            if ( allowed_bytes == 0 )
-                return lval;
-
             char* buf = new char[allowed_bytes];
             memcpy(buf, s->Bytes(), allowed_bytes);
 
diff --git a/src/threading/SerialTypes.cc b/src/threading/SerialTypes.cc
index 294d4e78a9..433136e475 100644
--- a/src/threading/SerialTypes.cc
+++ b/src/threading/SerialTypes.cc
@@ -376,7 +376,10 @@ bool Value::Write(detail::SerializationFormat* fmt) const {
         case TYPE_ENUM:
         case TYPE_STRING:
         case TYPE_FILE:
-        case TYPE_FUNC: return fmt->Write(val.string_val.data, val.string_val.length, "string");
+        case TYPE_FUNC: {
+            assert(val.string_val.data);
+            return fmt->Write(val.string_val.data, val.string_val.length, "string");
+        }
 
         case TYPE_TABLE: {
             if ( ! fmt->Write(val.set_val.size, "set_size") )