Early exit when dist already exists

Change-Id: I3e3772869cad11df6d5c07a1105a5ea8573e35bc