fixup some null/undefined handling for colony