diff --git a/src/core/misc.c b/src/core/misc.c
index 46720d62..4f316786 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -847,7 +847,7 @@ int parse_time_interval(const char *time, int *msecs)
 				return TRUE;
 			}
 
-			*msecs += number; /* assume seconds */
+			*msecs += number * 1000; /* assume seconds */
 			return FALSE;
 		}
 
diff --git a/src/core/settings.c b/src/core/settings.c
index 099699ca..33355ae2 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -67,14 +67,16 @@ static SETTINGS_REC *settings_get(const char *key, SettingType type)
 {
 	SETTINGS_REC *rec;
 
+	g_return_val_if_fail(key != NULL, NULL);
+
 	rec = settings_find(key);
 	if (rec == NULL) {
 		g_warning("settings_get(%s) : not found", key);
-		return 0;
+		return NULL;
 	}
 	if (type != -1 && rec->type != type) {
 		g_warning("settings_get(%s) : invalid type", key);
-		return 0;
+		return NULL;
 	}
 
 	return rec;