Improve error search