Much better error handling
Add tag to console logging