Fixed catch blocks.
Merge remote-tracking branch 'origin/master'
Fix merge-error with encryptions.
Restored multi catch.