Added robust checking