Removing npe bug.
Removing npe bug.