Add ImportError handling