[Observe-commits] 16/80: Fix NPE