Try/catch for issue #356