Enhanced process to keep unresolveable imports.