Fixing for null pointer exception when no Properties override provided.
Also adding a unit test for this.