diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h
index d875fd3e..d4130d68 100644
--- a/contrib/epee/include/misc_log_ex.h
+++ b/contrib/epee/include/misc_log_ex.h
@@ -120,6 +120,7 @@ DISABLE_VS_WARNINGS(4100)
 #endif 
 
 #define LOCATION_SS "[" << LOCAL_FUNCTION_DEF__ << ("] @ " __FILE__ ":" STR(__LINE__))
+#define LOCATION_CSTR ("[" LOCAL_FUNCTION_DEF__ "] @ " __FILE__ ":" STR(__LINE__))
 
 #if !defined(DISABLE_RELEASE_LOGGING)
   #define  ENABLE_LOGGING_INTERNAL
diff --git a/contrib/epee/include/serialization/keyvalue_helpers.h b/contrib/epee/include/serialization/keyvalue_helpers.h
index 0cf99221..61882816 100644
--- a/contrib/epee/include/serialization/keyvalue_helpers.h
+++ b/contrib/epee/include/serialization/keyvalue_helpers.h
@@ -64,7 +64,6 @@ namespace epee
     if (!epee::string_tools::hex_to_pod(a, res))
       throw std::runtime_error(std::string("Unable to transform \"") + a + "\" to pod type " + typeid(t_pod_type).name());
 		return res;
-    CHECK_AND_ASSERT_THROW_MES
 	}
 
   //basic helpers for blob-to-hex serialization