squash npe, fixing bug in Clean Imports