Handle use-before-assign warnings from pylint

Handle use-before-assign warnings from pylint #1848