Fix the null refs in the refrence message

#584