diff --git a/include/asterisk/stringfields.h b/include/asterisk/stringfields.h
index f3b44fd942..03b573287a 100644
--- a/include/asterisk/stringfields.h
+++ b/include/asterisk/stringfields.h
@@ -243,7 +243,7 @@ void __ast_string_field_ptr_build_va(struct ast_string_field_mgr *mgr,
 
 /*! \brief free all memory - to be called before destroying the object */
 #define ast_string_field_free_memory(x)	\
-	__ast_string_field_init(&(x)->__field_mgr, &(x)->__field_mgr_pool, -1, NULL, 0, NULL)
+	__ast_string_field_init(&(x)->__field_mgr, &(x)->__field_mgr_pool, -1, __FILE__, __LINE__, __PRETTY_FUNCTION__)
 
 /*!
  * \internal
diff --git a/main/astobj2.c b/main/astobj2.c
index 8ecc9c2589..9d23bf0f03 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -353,7 +353,7 @@ void *_ao2_alloc_debug(size_t data_size, ao2_destructor_fn destructor_fn, char *
 
 void *_ao2_alloc(size_t data_size, ao2_destructor_fn destructor_fn)
 {
-	return __ao2_alloc(data_size, destructor_fn, NULL, 0, NULL);
+	return __ao2_alloc(data_size, destructor_fn, __FILE__, __LINE__, __FUNCTION__);
 }
 
 
diff --git a/main/utils.c b/main/utils.c
index b11e2251f3..76223498e8 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -1575,7 +1575,7 @@ ast_string_field __ast_string_field_alloc_space(struct ast_string_field_mgr *mgr
 		if (add_string_pool(mgr, pool_head, new_size, mgr->owner_file, mgr->owner_line, mgr->owner_func))
 			return NULL;
 #else
-		if (add_string_pool(mgr, pool_head, new_size, NULL, 0, NULL))
+		if (add_string_pool(mgr, pool_head, new_size, __FILE__, __LINE__, __FUNCTION__))
 			return NULL;
 #endif
 	}