diff --git a/modules/consentManagement.js b/modules/consentManagement.js
index fcaeab815440..5f040c630516 100644
--- a/modules/consentManagement.js
+++ b/modules/consentManagement.js
@@ -90,6 +90,10 @@ function lookupIabConsent(cmpSuccess, cmpError, hookConfig) {
       f = f.parent;
     }
 
+    if (!cmpFrame) {
+      return cmpError('CMP not found.', hookConfig);
+    }
+
     callCmpWhileInIframe('getConsentData', cmpFrame, callbackHandler.consentDataCallback);
     callCmpWhileInIframe('getVendorConsents', cmpFrame, callbackHandler.vendorConsentsCallback);
   }
@@ -124,12 +128,6 @@ function lookupIabConsent(cmpSuccess, cmpError, hookConfig) {
     /* Setup up a __cmp function to do the postMessage and stash the callback.
       This function behaves (from the caller's perspective identicially to the in-frame __cmp call */
     window.__cmp = function(cmd, arg, callback) {
-      if (!cmpFrame) {
-        removePostMessageListener();
-
-        let errmsg = 'CMP not found';
-        return cmpError(errmsg, hookConfig);
-      }
       let callId = Math.random() + '';
       let msg = {__cmpCall: {
         command: cmd,
diff --git a/test/spec/modules/consentManagement_spec.js b/test/spec/modules/consentManagement_spec.js
index e825de2a1841..46ab6c46777c 100644
--- a/test/spec/modules/consentManagement_spec.js
+++ b/test/spec/modules/consentManagement_spec.js
@@ -68,35 +68,47 @@ describe('consentManagement', function () {
     });
 
     describe('error checks:', () => {
-      describe('unknown CMP framework ID:', () => {
-        beforeEach(() => {
-          sinon.stub(utils, 'logWarn');
-        });
+      beforeEach(() => {
+        didHookReturn = false;
+        sinon.stub(utils, 'logWarn');
+        sinon.stub(utils, 'logError');
+      });
 
-        afterEach(() => {
-          utils.logWarn.restore();
-          config.resetConfig();
-          $$PREBID_GLOBAL$$.requestBids.removeHook(requestBidsHook);
-          resetConsentData();
-        });
+      afterEach(() => {
+        utils.logWarn.restore();
+        utils.logError.restore();
+        config.resetConfig();
+        $$PREBID_GLOBAL$$.requestBids.removeHook(requestBidsHook);
+        resetConsentData();
+      });
+
+      it('should throw a warning and return to hooked function when an unknown CMP framework ID is used', () => {
+        let badCMPConfig = {
+          cmpApi: 'bad'
+        };
+        setConfig(badCMPConfig);
+        expect(userCMP).to.be.equal(badCMPConfig.cmpApi);
 
-        it('should return Warning message and return to hooked function', () => {
-          let badCMPConfig = {
-            cmpApi: 'bad'
-          };
-          setConfig(badCMPConfig);
-          expect(userCMP).to.be.equal(badCMPConfig.cmpApi);
+        requestBidsHook({}, () => {
+          didHookReturn = true;
+        });
+        let consent = gdprDataHandler.getConsentData();
+        sinon.assert.calledOnce(utils.logWarn);
+        expect(didHookReturn).to.be.true;
+        expect(consent).to.be.null;
+      });
 
-          didHookReturn = false;
+      it('should throw proper errors when CMP is not found', () => {
+        setConfig(goodConfigWithCancelAuction);
 
-          requestBidsHook({}, () => {
-            didHookReturn = true;
-          });
-          let consent = gdprDataHandler.getConsentData();
-          sinon.assert.calledOnce(utils.logWarn);
-          expect(didHookReturn).to.be.true;
-          expect(consent).to.be.null;
+        requestBidsHook({}, () => {
+          didHookReturn = true;
         });
+        let consent = gdprDataHandler.getConsentData();
+        // throw 2 errors; one for no bidsBackHandler and for CMP not being found (this is an error due to gdpr config)
+        sinon.assert.calledTwice(utils.logError);
+        expect(didHookReturn).to.be.false;
+        expect(consent).to.be.null;
       });
     });