Remove unused logging function
Catch exceptions in the parent

Not absolutely nescessary, but makes the intentions of
the method a little clearer
Merge remote-tracking branch 'origin/master'