diff --git a/src/rotest/management/client/result_client.py b/src/rotest/management/client/result_client.py
index 3ef849bf..30724a66 100644
--- a/src/rotest/management/client/result_client.py
+++ b/src/rotest/management/client/result_client.py
@@ -109,7 +109,7 @@ def update_run_data(self, run_data):
         if isinstance(response, FailureResponseModel):
             raise RuntimeError(response.details)
 
-    def add_result(self, test_item, result_code, info=None):
+    def add_result(self, test_item, result_code, info=""):
         """Update the result of the test item in the result server.
 
         Args:
@@ -201,7 +201,8 @@ def update_resources(self, test_item):
             resources = [ResourceDescriptor(type(resource),
                                             name=resource.data.name).encode()
                          for resource in
-                         test_item.locked_resources.itervalues()]
+                         test_item.locked_resources.itervalues()
+                         if resource.DATA_CLASS is not None]
 
         request_data = UpdateResourcesParamsModel({
             "test_details": {