AUI-1644 Check for value before calling one
AUI-1644 - General source formatting