diff --git a/lib/dump_utils.robot b/lib/dump_utils.robot
index 9070e0f..da47909 100644
--- a/lib/dump_utils.robot
+++ b/lib/dump_utils.robot
@@ -368,7 +368,6 @@
     # Description of argument(s):
     # task_id        Task ID.
 
-    ${task_status}=  Wait Until Keyword Succeeds  10 min  15 sec  Check Task Completion  ${task_id}
-    ${dump_id}=  Run Keyword If  '${task_status}' == 'Completed'  Get Dump ID  ${task_id}
-    ...  ELSE  Set Variable  None
-    [Return]  ${dump_id}  ${task_status}
+    Wait Until Keyword Succeeds  10 min  15 sec  Check Task Completion  ${task_id}
+    ${dump_id}=  Get Dump ID  ${task_id}
+    [Return]  ${dump_id}  Completed