Disable logging by default
Error handling improved