Changed error behavior to propagate exception without shutting down