Exception fix.
Merge branch 'develop' into ethereumx