diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_template.py b/lib/ansible/modules/cloud/ovirt/ovirt_template.py
index d885d882376..e2026362c20 100644
--- a/lib/ansible/modules/cloud/ovirt/ovirt_template.py
+++ b/lib/ansible/modules/cloud/ovirt/ovirt_template.py
@@ -376,11 +376,11 @@ EXAMPLES = '''
 
 # Import template
 - ovirt_template:
-  state: imported
-  name: mytemplate
-  export_domain: myexport
-  storage_domain: mystorage
-  cluster: mycluster
+    state: imported
+    name: mytemplate
+    export_domain: myexport
+    storage_domain: mystorage
+    cluster: mycluster
 
 # Remove template
 - ovirt_template:
@@ -1022,6 +1022,8 @@ def main():
                 template = templates_module.wait_for_import(
                     condition=lambda t: t.status == otypes.TemplateStatus.OK
                 )
+                if template is None:
+                    raise TimeoutError("Image/template '%s' could not be imported. Try again with larger timeout." % template_name)
                 ret = templates_module.create(result_state=otypes.TemplateStatus.OK)
                 ret = {
                     'changed': True,