Add root exception (cause) in the signature.
Fixing minor merge conflicts