Merge "Remove raise exceptions"