Don't call shutdown() after an exception (backport #1400)

Don't call shutdown() after an exception (backport #1400) #482