Merge "PlayerBase: more general exception catching in release"