Fix for corner case with multiple property expansions
Error handling cleanup
Mock commit of bat files