rescue against twitter gem error
Merge branch 'enhancements'