diff --git a/build.gradle b/build.gradle
index dad8761..464d009 100644
--- a/build.gradle
+++ b/build.gradle
@@ -164,4 +164,4 @@ spotless {
         trimTrailingWhitespace()
         endWithNewline()
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/templates/libs/itbp-risk.md b/src/main/resources/templates/libs/itbp-risk.md
index 92a7e9f..aeb4ab2 100644
--- a/src/main/resources/templates/libs/itbp-risk.md
+++ b/src/main/resources/templates/libs/itbp-risk.md
@@ -3,7 +3,6 @@
 <#import "/libs/risk-commons.md" as rcom>
 
 <#macro riskdisplay headinglevel targetObject risk domain riskDefinition={}>
-<#assign riskCategoriesWithMatrix=riskDefinition.categories?filter(it->it.valueMatrix?has_content)>
 
 <div class="risk">
 
@@ -15,7 +14,11 @@
 
 <@com.def "Risikobeschreibung", scenario.description />
 
-<#assign riskValues = risk.getRiskValues(domain.id, riskDefinition.id)>
+<#if riskDefinition?has_content>
+
+<#assign riskCategoriesWithMatrix=(riskDefinition.categories?filter(it->it.valueMatrix?has_content))>
+
+<#assign riskValues = (risk.getRiskValues(domain.id, riskDefinition.id))!>
 
 <#if riskValues?has_content && (riskValues.effectiveProbability?has_content
                               || riskValues.effectiveProbabilityExplanation?has_content
@@ -111,6 +114,7 @@ ${riskValuesForCategory.riskTreatmentExplanation}
 Für diese Gefährdung wurde noch keine Risikobewertung vorgenommen.
 </#if>
 
+</#if>
 <#if risk.mitigation?has_content && risk.mitigation.parts?has_content>
 <table class="table " style="width:100%;font-size:70%;">
 <colgroup>
diff --git a/src/main/resources/templates/vvt.md b/src/main/resources/templates/vvt.md
index 706cc45..7d3c65c 100644
--- a/src/main/resources/templates/vvt.md
+++ b/src/main/resources/templates/vvt.md
@@ -149,7 +149,7 @@ dl.tom dd {
    'person_contactInformation_email'
   ]/>
 
-<#if (scope.scope_thirdCountry_status??)>
+<#if scope.scope_thirdCountry_status!false>
 <@table bundle.thirdCountry_table_caption, scope, [
   'scope_thirdCountry_name',
   'scope_thirdCountry_address1',