NullReferenceException fix for #17 + binaries.