[To Main] Fix for issue of null appearing in public URLs

[To Main] Fix for issue of null appearing in public URLs #2906