possible implementation to address  #13183

to prevent against null/undefined