Slightly more robust checking