Second part changes DefaultRecordStore check-style compliance.

not my code but AFAIS this style was used in another services too, for example ```MultiMapContainer```. But currently i have nothing to say when it is null.