Fixed exceptions on approval page