Prepare for release

Make highlighting more robust wrt exceptions