Verifying null fix.
Merge branch 'marwanhilmi-master'
1.1.1