diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass
index 4ef664b3ce..fed8163c3e 100644
--- a/meta/classes-global/insane.bbclass
+++ b/meta/classes-global/insane.bbclass
@@ -35,7 +35,7 @@ CHECKLAYER_REQUIRED_TESTS = "\
     packages-list patch-fuzz patch-status perllocalpod perm-config perm-line perm-link recipe-naming \
     pkgconfig pkgvarcheck pkgv-undefined pn-overrides shebang-size src-uri-bad symlink-to-sysroot \
     unhandled-features-check unknown-configure-option unlisted-pkg-lics uppercase-pn useless-rpaths \
-    var-undefined virtual-slash xorg-driver-abi"
+    virtual-slash xorg-driver-abi"
 
 # Elect whether a given type of error is a warning or error, they may
 # have been set by other files.
diff --git a/meta/classes-global/package.bbclass b/meta/classes-global/package.bbclass
index 9be1d6a5b1..d7ff333f20 100644
--- a/meta/classes-global/package.bbclass
+++ b/meta/classes-global/package.bbclass
@@ -494,8 +494,7 @@ python do_package () {
     pn = d.getVar('PN')
 
     if not workdir or not outdir or not dest or not dvar or not pn:
-        msg = "WORKDIR, DEPLOY_DIR, D, PN and PKGD all must be defined, unable to package"
-        oe.qa.handle_error("var-undefined", msg, d)
+        bb.fatal("WORKDIR, DEPLOY_DIR, D, PN and PKGD all must be defined, unable to package")
         return
 
     bb.build.exec_func("package_setup_pkgv", d)