Exception handling improvements
Enable SMS service
Merge branch 'dev'