THUMB Minor fixes

Remove RuntimeException, it won't ever occur. Autoformat imports.