handle the empty case better

Change-Id: Ie1f5e46f7c9c02bd98b892103776a7098ecce7db
Merge "handle the empty case better"