Validate correct paths

Change-Id: Iefe99439fb1da968244c9330e05927fd09ca3787