[Observe-commits] 04/07: Fix NPE