Fix latent bug in initializing placeholder Unit when unit is not found.
merge with master