Some words
Changed error handling