fixes to exception handling
fixes to exception handling
Merge branch 'develop' of https://github.com/eclipse/kura into develop