Extend gitter repository
Improved error handling