Added conditional to check for null value of parentLocation
Merge pull request #2680 from ten24/feature-ds-saveLocationIssue

Added conditional to check for null value of parentLocation