Fix of Revision: ec7b8d0b2c after code review. Added a check condition before remov...