diff --git a/SAS/TMSS/client/lib/tmss_http_rest_client.py b/SAS/TMSS/client/lib/tmss_http_rest_client.py
index 19e29db4a520abfcfe45c3279e1cf3f97d9f8b10..0773902466b1294f012b6a7bcbb87cc1783da41e 100644
--- a/SAS/TMSS/client/lib/tmss_http_rest_client.py
+++ b/SAS/TMSS/client/lib/tmss_http_rest_client.py
@@ -332,7 +332,7 @@ class TMSSsession(object):
                 raise ValueError("Found more then one %s for clauses: %s" % (template_type_name, clauses))
             elif len(result) == 1:
                 return result[0]
-            return None
+            raise ValueError("Could not find any template. template_type_name='%s' clauses='%s'" % (template_type_name, clauses))
         return result
 
     def get_schedulingunit_template(self, name: str, version: int=None) -> dict: