fixed uri and add a check for null; NEEDS OTHER LOGIC MODS
Authored by: davism84 2018-02-08
Parent: [r2432]
Child: [r2434]