diff --git a/server/modules/routing/binlog/blr_slave.c b/server/modules/routing/binlog/blr_slave.c
index 64616c674..3b78e3d01 100644
--- a/server/modules/routing/binlog/blr_slave.c
+++ b/server/modules/routing/binlog/blr_slave.c
@@ -4540,7 +4540,7 @@ blr_get_parsed_command_value(char *input)
     char *word;
     char *value = NULL;
 
-    if (strlen(input))
+    if (input && strlen(input))
     {
         value = strdup(input);
     }
diff --git a/server/modules/routing/binlog/test/CMakeLists.txt b/server/modules/routing/binlog/test/CMakeLists.txt
index bc8514791..d600418eb 100644
--- a/server/modules/routing/binlog/test/CMakeLists.txt
+++ b/server/modules/routing/binlog/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 if(BUILD_TESTS)
   add_executable(testbinlogrouter testbinlog.c ../blr.c ../blr_slave.c ../blr_master.c ../blr_file.c ../blr_cache.c)
   target_link_libraries(testbinlogrouter maxscale-common ${PCRE_LINK_FLAGS} uuid)
-  add_test(TestBinlogRouter ${CMAKE_CURRENT_BINARY_DIR}/testbinlogrouter)
+  add_test(NAME TestBinlogRouter COMMAND ./testbinlogrouter WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 endif()