catch for serialization
Merging release into master.