Code cleanup to some exceptions traceback