osgi: resources reordered
osgi: NPE fixed
Cleanup (nullability)