diff --git a/robot/resources/test_templates/hvves_template.robot b/robot/resources/test_templates/hvves_template.robot
index 682566f..5ee9a02 100644
--- a/robot/resources/test_templates/hvves_template.robot
+++ b/robot/resources/test_templates/hvves_template.robot
@@ -15,8 +15,9 @@
     [Arguments]     ${kafka_server}     ${kafka_port}   ${kafka_topic}
     [Teardown]      Close
     Connect Consumer    bootstrap_servers=${kafka_server}:${kafka_port}
-    ${msg_number}=      Get Number Of Messages In Topics    ${kafka_topic}
-    [Return]    ${msg_number}
+    ${status}   ${msg_number}=      Run Keyword And Ignore Error        Get Number Of Messages In Topics    ${kafka_topic}
+    Run Keyword If      '${status}' == 'FAIL'   Return From Keyword     0
+    Run Keyword If      '${status}' == 'PASS'   Return From Keyword     ${msg_number}
 
 Define WTP Protocol
     [Documentation]     Defines Wire Transfer Protocol.
diff --git a/robot/testsuites/hvves.robot b/robot/testsuites/hvves.robot
index c56f7e1..b7c718a 100644
--- a/robot/testsuites/hvves.robot
+++ b/robot/testsuites/hvves.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation   HV-VES 'Sunny Scenario' Robot Framwork test - message is sent to the collector and Kafka topic is checked if the message has been published.
 Default Tags    HVVES
-Test Timeout    3 minute
+Test Timeout    30s
 Resource    ${EXECDIR}/robot/resources/global_properties.robot
 Resource    ${EXECDIR}/robot/resources/test_templates/hvves_template.robot
 Suite Teardown  Reset Rammbock