Keep passed exception if original_exception is nil
Merge pull request #271 from rykov/master

Keep passed exception if original_exception is nil