#134. Add throwing IllegalArgument exception when trying to delete. Fix the possible NPE bug.