updated package
added a null check for activator