fix scheme properties that are set to null
Merge pull request #40 from rkusa/master

fix scheme properties that are set to null