IOExceptions & other fixes.
Merge branch '4.1_SMBResourceProvider' into 4.1
4.1.2.006