fixing issue with null properties in server scope