Revert "refix same npe, lost because of the qcril merge"

This reverts commit 67d2fb77da119c39344a749b8f3cedf5e59dc824.