Added exception to remove method