Bug fix: empty TargetPath throws error