Otr fix for race conditions
dataplug: fix NPE