Can you remove this else and try w/ either my PR or the change I told you on IM? (https://github.com/edx/edx-platform/pull/2244)