again correct management of null id.