IDE-1418 add sapphire handler check to remove create handler