Remote

You have to do a null check after acquiring an OSGi service from DataHolder. Fix all the occurrences of the same in this PR.