OHAI-541: catch more opportunities for invalid returns

Post-review, a couple more locations that have some potential to
return an invalid value when called, now guarded with some valid
response.