Fix for staging and production

exception notification text
Merge branch 'develop'