additional error catching on golfchannel
Merge pull request #681 from Gerk/golfchannel

additional error catching on golfchannel