[Observe-commits] 16/79: Fix NPE