added a few actions and exception hadling
added a few actions and exception handling
Merge branch 'develop'