Fixed an errant throw
Bugfixes in logging