Removed unused imports
Debug
More NPE checks