Achievement button, and better error handling