added checking if handling was performed