fixing issue with null properties in server scope
Merge pull request #40 from d1rtym0nk3y/master

fixing issue with null properties in server scope