Better error msgs, remove extraneous player insert