issue 3505 fix: check to make sure chapter exists first
issue 3505 fix: add a test, for great justice
issue 3505 fix: fixed test step
Merge pull request #1745 from scottsds/issue_3505_fix

issue 3505 fix: check to make sure chapter exists first