- Fix NPE when retrieving an entity with a null UUID