Removed unused imports
Fixed potential crash
Merge remote-tracking branch 'origin/thislooksfun'