Fixed NPE when nothing has been added (i.e first time)