diff --git configure.ac configure.ac
index bc966cd..6265f28 100644
--- configure.ac
+++ configure.ac
@@ -121,6 +121,7 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [
   LDFLAGS="$LDFLAGS -Wl,--dynamic-linker=/lib64/ld64.so.2"
 ])
 
+CPPFLAGS="$CPPFLAGS -Wno-implicit-fallthrough"
 CFLAGS="$CFLAGS -Werror -DMST_UL"
 CXXFLAGS="$CXXFLAGS -Werror -DMST_UL"
 
diff --git fw_comps_mgr/fw_comps_mgr.cpp fw_comps_mgr/fw_comps_mgr.cpp
index f4afc0c..ec6dad0 100644
--- fw_comps_mgr/fw_comps_mgr.cpp
+++ fw_comps_mgr/fw_comps_mgr.cpp
@@ -804,7 +804,6 @@ void FwCompsMgr::extractRomInfo(tools_open_mgir* mgir, fwInfoT* fwQuery)
 bool FwCompsMgr::queryFwInfo(fwInfoT* query)
 {
     if (!query) {
-        return FWCOMPS_BAD_PARAM;
         return false;
     }
     memset(query, 0, sizeof(fwInfoT));