Work around some NPE found during debugging on some RHUI issues