Fixed random client crashes
Merge branch 'ferrybig'