Put some failsafes
Merge branch 'textalytics' into staging
Merge branch 'staging' of https://github.com/pelluch/mashups-backend into staging
graaaaaan fix