Fixed improper masking of circular ImportError.