Make raise
available in Option.catch
#3481
Merged
raise
available in Option.catch
#3481