1 files changed, 4 insertions, 1 deletions

diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 471c32bce2..1ea4bc5e02 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -155,7 +155,10 @@ python patch_do_patch() {
                         patchset.Import({"file":local, "strippath": parm['striplevel']}, True)
                 except Exception as exc:
                         bb.fatal(str(exc))
-                resolver.Resolve()
+                try:
+                        resolver.Resolve()
+                except bb.BBHandledException as e:
+                        bb.fatal(str(e))
 }
 patch_do_patch[vardepsexclude] = "PATCHRESOLVE"