Merge pull request #1040 from keertip/ex

fix for exception seen in be builds