Merge "Added extra validation for invalid paths." into nyc-dev