Added Logging
Added Exception