Fix silent catch + better player handling