There were some try-excepts here originally from master that seem to be missing - it looks like logging the image flavor and performance flavor stuff didn't get merged in?