Add Thor catch-all error case
Add logging support