Better handle null adapters and NPEs in the CQE