More aggressive import error handling