[Observe-commits] 15/34: Fix NPE