diff --git a/CHANGELOG.md b/CHANGELOG.md
index db8cc66..dd2acde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,11 @@ Gradle MaryTTS Component Plugin
 
 - Group to all tasks
 
+### Fixed
+
+- Downstream failures when wrong template unpacking configuration produced `null` source files
+- Failures in generated integration tests, when non-namespaced `name` property is loaded from other MaryConfigs
+
 ### Changed
 
 - [all changes since v0.3.0]
diff --git a/src/main/groovy/de/dfki/mary/tasks/UnpackSourceTemplates.groovy b/src/main/groovy/de/dfki/mary/tasks/UnpackSourceTemplates.groovy
index 66d4b79..b0f5ca4 100644
--- a/src/main/groovy/de/dfki/mary/tasks/UnpackSourceTemplates.groovy
+++ b/src/main/groovy/de/dfki/mary/tasks/UnpackSourceTemplates.groovy
@@ -18,7 +18,9 @@ class UnpackSourceTemplates extends DefaultTask {
     void unpack() {
         resourceNames.get().each { resourceName ->
             destDir.file(resourceName).get().asFile.withWriter {
-                it << this.class.getResourceAsStream(resourceName)
+                def resource = this.class.getResourceAsStream(resourceName)
+                assert resource: "Source template $resourceName could not be found for unpacking"
+                it << resource
             }
         }
     }
diff --git a/src/main/resources/de/dfki/mary/tasks/IntegrationTest.groovy b/src/main/resources/de/dfki/mary/tasks/IntegrationTest.groovy
index 0189d70..e0b1c43 100644
--- a/src/main/resources/de/dfki/mary/tasks/IntegrationTest.groovy
+++ b/src/main/resources/de/dfki/mary/tasks/IntegrationTest.groovy
@@ -29,6 +29,8 @@ ${project.marytts.component.config.collect { key, value ->
     public void canGetProperty(name, expected) {
         def actual
         switch (name) {
+            case 'name':
+                break
             case ~/.+\\.list\$/:
                 actual = MaryProperties.getList(name)
                 assert actual.containsAll(expected)
diff --git a/src/test/resources/de/dfki/mary/LoadHelloIT.groovy b/src/test/resources/de/dfki/mary/LoadHelloIT.groovy
index 7ab9872..1868d7d 100644
--- a/src/test/resources/de/dfki/mary/LoadHelloIT.groovy
+++ b/src/test/resources/de/dfki/mary/LoadHelloIT.groovy
@@ -25,6 +25,8 @@ class LoadHelloIT {
     public void canGetProperty(name, expected) {
         def actual
         switch (name) {
+            case 'name':
+                break
             case ~/.+\.list$/:
                 actual = MaryProperties.getList(name)
                 assert actual.containsAll(expected)
diff --git a/src/test/resources/de/dfki/mary/LoadMyComponentIT.groovy b/src/test/resources/de/dfki/mary/LoadMyComponentIT.groovy
index 1d14c23..8d4cb1a 100644
--- a/src/test/resources/de/dfki/mary/LoadMyComponentIT.groovy
+++ b/src/test/resources/de/dfki/mary/LoadMyComponentIT.groovy
@@ -23,6 +23,8 @@ class LoadMyComponentIT {
     public void canGetProperty(name, expected) {
         def actual
         switch (name) {
+            case 'name':
+                break
             case ~/.+\.list$/:
                 actual = MaryProperties.getList(name)
                 assert actual.containsAll(expected)