diff --git a/bbfdmd/ubus/CMakeLists.txt b/bbfdmd/ubus/CMakeLists.txt
index e97e0392..68f0a617 100644
--- a/bbfdmd/ubus/CMakeLists.txt
+++ b/bbfdmd/ubus/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 
 PROJECT(bbfdmd)
 
-ADD_DEFINITIONS(-fstrict-aliasing -Wall -Wextra -Werror -Wformat -Wformat-signedness -g -fPIC -D_GNU_SOURCE)
+ADD_DEFINITIONS(-fstrict-aliasing -Wall -Wextra -Werror -Wformat -Wformat-signedness -g3 -fPIC -D_GNU_SOURCE)
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/libbbfdm-api/legacy -I${CMAKE_SOURCE_DIR}/libbbfdm-api/version-2 -I${CMAKE_SOURCE_DIR}/libbbfdm-ubus")
 
diff --git a/dm-service/CMakeLists.txt b/dm-service/CMakeLists.txt
index 419724d5..5bc4d874 100644
--- a/dm-service/CMakeLists.txt
+++ b/dm-service/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 
 PROJECT(dm-service C)
 
-ADD_DEFINITIONS(-fstrict-aliasing -Wall -Wextra -Werror -Wformat -Wformat-signedness -g -fPIC -D_GNU_SOURCE)
+ADD_DEFINITIONS(-fstrict-aliasing -Wall -Wextra -Werror -Wformat -Wformat-signedness -g3 -fPIC -D_GNU_SOURCE)
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/libbbfdm-api/legacy -I${CMAKE_SOURCE_DIR}/libbbfdm-api/version-2 -I${CMAKE_SOURCE_DIR}/libbbfdm-ubus")
 
diff --git a/libbbfdm-api/legacy/CMakeLists.txt b/libbbfdm-api/legacy/CMakeLists.txt
index 74fd1bef..cc55bbaa 100644
--- a/libbbfdm-api/legacy/CMakeLists.txt
+++ b/libbbfdm-api/legacy/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 
 PROJECT(libbbfdm-api-legacy)
 
-ADD_DEFINITIONS(-Wall -Werror -g -D_GNU_SOURCE)
+ADD_DEFINITIONS(-Wall -Werror -g3 -D_GNU_SOURCE)
 ADD_DEFINITIONS(-DBBF_VENDOR_PREFIX="${BBF_VENDOR_PREFIX}")
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SOURCE_DIR}")
diff --git a/libbbfdm-api/legacy/dmbbf.h b/libbbfdm-api/legacy/dmbbf.h
index db41b5d7..94eb1a14 100644
--- a/libbbfdm-api/legacy/dmbbf.h
+++ b/libbbfdm-api/legacy/dmbbf.h
@@ -58,8 +58,10 @@ int dm_link_inst_obj(struct dmctx *dmctx, DMNODE *parent_node, void *data, char
 static inline int DM_LINK_INST_OBJ(struct dmctx *dmctx, DMNODE *parent_node, void *data, char *instance)
 {
 	dmctx->faultcode = dm_link_inst_obj(dmctx, parent_node, data, instance);
-	if (dmctx->stop || parent_node->num_of_entries >= BBF_MAX_OBJECT_INSTANCES)
+	if (dmctx->stop || parent_node->num_of_entries >= BBF_MAX_OBJECT_INSTANCES) {
+		BBFDM_ERR("%s has reached max %d number of entries", parent_node->current_object, BBF_MAX_OBJECT_INSTANCES);
 		return DM_STOP;
+	}
 	return DM_OK;
 }
 
diff --git a/libbbfdm-api/version-2/CMakeLists.txt b/libbbfdm-api/version-2/CMakeLists.txt
index 64d137af..28442efd 100644
--- a/libbbfdm-api/version-2/CMakeLists.txt
+++ b/libbbfdm-api/version-2/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 
 PROJECT(libbbfdm-api-version-2)
 
-ADD_DEFINITIONS(-Wall -Werror -g -D_GNU_SOURCE)
+ADD_DEFINITIONS(-Wall -Werror -g3 -D_GNU_SOURCE)
 
 FILE(GLOB BBFDM_API_SOURCES *.c)
 
diff --git a/libbbfdm/CMakeLists.txt b/libbbfdm/CMakeLists.txt
index 79597b6f..303908f0 100644
--- a/libbbfdm/CMakeLists.txt
+++ b/libbbfdm/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 
 PROJECT(libbbfdm)
 
-ADD_DEFINITIONS(-Wall -Werror -g -D_GNU_SOURCE -DBBF_VENDOR_PREFIX="${BBF_VENDOR_PREFIX}")
+ADD_DEFINITIONS(-Wall -Werror -g3 -D_GNU_SOURCE -DBBF_VENDOR_PREFIX="${BBF_VENDOR_PREFIX}")
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/libbbfdm-api/version-2")
 FILE(GLOB BBF_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.c)