Put some more checks in...