Improve ISA-Tab import error handling. Code cleanup.