Merge "hs20-osu-client: Ensure NULL checks are done before dereferencing"