add disabled check.
Merge pull request #1314 from edx/e0d/add-disabled-check

add disabled check.