Use ExceptionInfo instead of SerializableException
Merge branch 'develop'