Add more robust logging

Refs #103 @00:30