Fix nil assignability
Merge pull request #570 from m0sth8/master

Fix nil assignability