Exception Processing [master]
merged