diff --git a/src/conf.c b/src/conf.c
index 167f2da92..a22f2ec91 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -317,7 +317,7 @@ config_read_block(FILE *fp, int *count, char *string, GError **error_r)
 				g_set_error(error_r, config_quark(), 0,
 					    "line %i: Unknown tokens after '}'",
 					    *count);
-				return false;
+				return NULL;
 			}
 
 			return ret;
diff --git a/src/song_update.c b/src/song_update.c
index 37f502a20..f9d6b6f46 100644
--- a/src/song_update.c
+++ b/src/song_update.c
@@ -187,7 +187,7 @@ song_file_update_inarchive(struct song *song)
 	if (suffix == NULL)
 		return false;
 
-	plugin = decoder_plugin_from_suffix(suffix, false);
+	plugin = decoder_plugin_from_suffix(suffix, NULL);
 	if (plugin == NULL)
 		return false;
 
diff --git a/src/update_song.c b/src/update_song.c
index 1126ad115..f5930d688 100644
--- a/src/update_song.c
+++ b/src/update_song.c
@@ -104,7 +104,7 @@ update_song_file(struct directory *directory,
 		 const struct stat *st)
 {
 	const struct decoder_plugin *plugin =
-		decoder_plugin_from_suffix(suffix, false);
+		decoder_plugin_from_suffix(suffix, NULL);
 	if (plugin == NULL)
 		return false;