Fix last commit

While changing around the variable names in the last commit,
we actually broke the code in the except case.