speedup application shutdown
POI: add null check on delete poi