Better console + error handling