More robust checking