Fix for unnecessary exception during authorization in logs.

Cleanup of existing sdk code.