Temporarily added some more checks here.