Fix Null Ref
Merge branch 'Employment' into TestServer