added error handling :8ball: