NT service patch from Matt Edman to improve error messages, lightly cleaned; needs...