Fix small brain damage
TODO: We need to test exception logging