Clean up errors conditional block