Better handle checking