Still a serialization error. Fixed crashing so that master works again.