Fix some domutcheck NPEs.