Add return on exception.