Bugfix: null check on oov_list