Fixed NPE on removing 1 item.