Catch another Exception
and the same for contexts
Merge branch 'develop' into rodin3