Fixed issue when no path exists
Merge branch 'Development'