Small fixes, mainly in throws signatures
Merge pull request #867 from dbrazhnikov/signature_fix

Small fixes, mainly in throws signatures