Fixing some exceptions from last build.
Fixing some exceptions from last build.

azmanomer/Source,azmanomer/Source,Sphereserver/Source,Sphereserver/Source,drk84/Source,drk84/Source,Sphereserver/Source2,Sphereserver/Source2