Null assignment exception still exists. Merged from master - bec121f8: Merge pull request #147 from voloda/Issue#144