Removed futile imports
JSUTIL-155, added null check for original issue