Close #44 PR: Fix #38 400-level errors.