Cleaned up some handled excepitons at client start.
Merge pull request #214 from rekcon/master

Cleaned up some handled excepitons at client start.