Better exception handling for #55