[sr-dev] git:master: rls: proper header define guard and check of null returned value