diff --git a/src/switch_core.c b/src/switch_core.c
index 16618b6395..6d75542a23 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -937,29 +937,29 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
 #endif
 				} else if (!strcasecmp(var, "colorize-console") && switch_true(val)) {
 					runtime.colorize_console = SWITCH_TRUE;
-				} else if (!strcasecmp(var, "mailer-app")) {
+				} else if (!strcasecmp(var, "mailer-app") && !switch_strlen_zero(val)) {
 					runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val);
-				} else if (!strcasecmp(var, "mailer-app-args")) {
+				} else if (!strcasecmp(var, "mailer-app-args") && !switch_strlen_zero(val)) {
 					runtime.mailer_app_args = switch_core_strdup(runtime.memory_pool, val);
-				} else if (!strcasecmp(var, "sessions-per-second")) {
+				} else if (!strcasecmp(var, "sessions-per-second") && !switch_strlen_zero(val)) {
 					switch_core_sessions_per_second(atoi(val));
-				} else if (!strcasecmp(var, "max_dtmf_duration")) {
+				} else if (!strcasecmp(var, "max_dtmf_duration") && !switch_strlen_zero(val)) {
 					int tmp = atoi(val);
 					if (tmp > 0) {
 						switch_core_max_dtmf_duration((uint32_t) tmp);
 					}
-				} else if (!strcasecmp(var, "default_dtmf_duration")) {
+				} else if (!strcasecmp(var, "default_dtmf_duration") && !switch_strlen_zero(val)) {
 					int tmp = atoi(val);
 					if (tmp > 0) {
 						switch_core_default_dtmf_duration((uint32_t) tmp);
 					}
 				} else if (!strcasecmp(var, "disable-monotonic-timing")) {
 					switch_time_set_monotonic(SWITCH_FALSE);
-				} else if (!strcasecmp(var, "max-sessions")) {
+				} else if (!strcasecmp(var, "max-sessions") && !switch_strlen_zero(val)) {
 					switch_core_session_limit(atoi(val));
-				} else if (!strcasecmp(var, "rtp-start-port")) {
+				} else if (!strcasecmp(var, "rtp-start-port") && !switch_strlen_zero(val)) {
 					switch_rtp_set_start_port((switch_port_t) atoi(val));
-				} else if (!strcasecmp(var, "rtp-end-port")) {
+				} else if (!strcasecmp(var, "rtp-end-port") && !switch_strlen_zero(val)) {
 					switch_rtp_set_end_port((switch_port_t) atoi(val));
 				}
 			}
diff --git a/src/switch_log.c b/src/switch_log.c
index 3a43ef0f9a..26cc81e3e8 100644
--- a/src/switch_log.c
+++ b/src/switch_log.c
@@ -259,6 +259,8 @@ SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char
 		return;
 	}
 
+	switch_assert(level < SWITCH_LOG_INVALID);
+
 	va_start(ap, fmt);
 
 	handle = switch_core_data_channel(channel);
@@ -333,8 +335,8 @@ SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char
 				if (COLORIZE) {
 
 #ifdef WIN32
-					SetConsoleTextAttribute(hStdout, COLORS[node->level]);
-					WriteFile(hStdout, node->data, (DWORD) strlen(node->data), NULL, NULL);
+					SetConsoleTextAttribute(hStdout, COLORS[level]);
+					WriteFile(hStdout, data, (DWORD) strlen(data), NULL, NULL);
 					SetConsoleTextAttribute(hStdout, wOldColorAttrs);
 #else
 					fprintf(handle, "%s%s%s", COLORS[level], data, SWITCH_SEQ_DEFAULT_COLOR);