Error handling and Thumbs Up fix