Handle check simplified