Merge "Catch exceptions thrown inside the Handler" into main