Fixing issue#39 for CheckForErrors