IDE-1418 Add Sapphire handler check to remove create handler