Merge "Fix type of exception no longer matching after someone changed it without...