BONGOMAGIC-1049 fix NoneType error