diff --git a/test/rbus/provider/rbusTestProvider.c b/test/rbus/provider/rbusTestProvider.c
index 0cf5f495..1287e2af 100644
--- a/test/rbus/provider/rbusTestProvider.c
+++ b/test/rbus/provider/rbusTestProvider.c
@@ -384,8 +384,17 @@ rbusError_t addTable2RowHandler(TableNode* tableNode, char const* alias, uint32_
         return err;
 
     /*add properties and tables to the new row object*/
-    createTableNode((Node*)rowNode, "Table3", addTable3RowHandler);
-    createPropertyNode((Node*)rowNode, "data");
+    if(!createTableNode((Node*)rowNode, "Table3", addTable3RowHandler))
+    {
+        destroyNode((Node*)rowNode);
+        return RBUS_ERROR_OUT_OF_RESOURCES;
+    }
+    
+    if(!createPropertyNode((Node*)rowNode, "data"))
+    {
+        destroyNode((Node*)rowNode);
+        return RBUS_ERROR_OUT_OF_RESOURCES;
+    }
 
     return RBUS_ERROR_SUCCESS;
 }
@@ -401,8 +410,17 @@ rbusError_t addTable1RowHandler(TableNode* tableNode, char const* alias, uint32_
         return err;
 
     /*add properties and tables to the new row object*/
-    createTableNode((Node*)rowNode, "Table2", addTable2RowHandler);
-    createPropertyNode((Node*)rowNode, "data");
+    if(!createTableNode((Node*)rowNode, "Table2", addTable2RowHandler))
+    {
+        destroyNode((Node*)rowNode);
+        return RBUS_ERROR_OUT_OF_RESOURCES;
+    }
+    
+    if(!createPropertyNode((Node*)rowNode, "data"))
+    {
+        destroyNode((Node*)rowNode);
+        return RBUS_ERROR_OUT_OF_RESOURCES;
+    }
 
     return RBUS_ERROR_SUCCESS;
 }