Merge "Fix typo that causes NameError: global name 'exception' exception"