Wrap exceptions in a SerializableException
Merge branch 'develop'