Fixed issue where null in DB could cause unpack issue