code refactoring, extra rescue blocks removed + extra functions removed ...
Merge branch 'master' of github.com:munirehmad/vaalend
resolving merge conflicts ...