diff --git a/src/core/log.c b/src/core/log.c
index 5435708..e148578 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -49,31 +49,27 @@
 
 /*---[ Implementacao ]--------------------------------------------------------------------------------------*/
 
- LIB3270_EXPORT void lib3270_set_log_handler(void (*handler)(H3270 *, const char *, int, const char *, va_list))
- {
+ LIB3270_EXPORT void lib3270_set_log_handler(void (*handler)(H3270 *, const char *, int, const char *, va_list)) {
 	loghandler = handler ? handler : default_log_writer;
  }
 
- LIB3270_EXPORT int lib3270_write_log(H3270 *session, const char *module, const char *fmt, ...)
- {
+ LIB3270_EXPORT int lib3270_write_log(H3270 *session, const char *module, const char *fmt, ...) {
 	va_list arg_ptr;
 	va_start(arg_ptr, fmt);
-	loghandler(session,module,0,fmt,arg_ptr);
+	loghandler(session,module ? module : LIB3270_STRINGIZE_VALUE_OF(PRODUCT_NAME),0,fmt,arg_ptr);
 	va_end(arg_ptr);
     return 0;
  }
 
- LIB3270_EXPORT int lib3270_write_rc(H3270 *session, const char *module, int rc, const char *fmt, ...)
- {
+ LIB3270_EXPORT int lib3270_write_rc(H3270 *session, const char *module, int rc, const char *fmt, ...) {
 	va_list arg_ptr;
 	va_start(arg_ptr, fmt);
-	loghandler(session,module,rc,fmt,arg_ptr);
+	loghandler(session,module ? module : LIB3270_STRINGIZE_VALUE_OF(PRODUCT_NAME),rc,fmt,arg_ptr);
 	va_end(arg_ptr);
     return rc;
  }
 
- LIB3270_EXPORT void lib3270_write_va_log(H3270 *session, const char *module, const char *fmt, va_list arg)
- {
-	loghandler(session,module,0,fmt,arg);
+ LIB3270_EXPORT void lib3270_write_va_log(H3270 *session, const char *module, const char *fmt, va_list arg) {
+	loghandler(session,module ? module : LIB3270_STRINGIZE_VALUE_OF(PRODUCT_NAME),0,fmt,arg);
  }
 
--
libgit2 0.21.2