diff --git a/scripts/patch b/scripts/patch
index 2afb7eea..4e4b8765 100755
--- a/scripts/patch
+++ b/scripts/patch
@@ -94,7 +94,8 @@ patch_validate_patch() {
   if [ -f "${template}" ] ; then
     log_debug "Found template for the patch: '${template}'"
   else
-    log_error "Missing template for patch '${patch}'"
+    log_error "Missing template '${template}'"
+    log_error "       for patch '${patch}'"
     bad_files+=("${patch}")
     return 1
   fi
diff --git a/t/test_ngcpcfg_patch.py b/t/test_ngcpcfg_patch.py
index 784eeebf..a72875ea 100644
--- a/t/test_ngcpcfg_patch.py
+++ b/t/test_ngcpcfg_patch.py
@@ -165,8 +165,8 @@ def test_patch_action_template_missing_for_patchtt(ngcpcfgcli, tmpdir):
 
     assert "Validating patch '" + str(template_path) + \
         "/apt/apt.conf.d/71_no_recommended.patchtt.tt2'" in out.stdout
-    assert "Error: Missing template for patch '" + str(template_path) + \
-        "/apt/apt.conf.d/71_no_recommended.patchtt.tt2'" in out.stderr
+    assert "Error: Missing template '" + str(template_path) + \
+        "/apt/apt.conf.d/71_no_recommended.tt2'" in out.stderr
     assert "Error: Some operations above finished with an error for the file(s)" in out.stderr
     assert 'Requested patchtt operation has finished successfully.' not in out.stdout