Merge "Logs has to be removed while throwing exceptions"