Added dispose protection after defect fix was incomplete.