Ensure idempotency and fixed volume detection error

Tested to be working against Windows Server 2008r2 and Windows Server 2012r2