OHAI-541: catch more opportunities for invalid returns

https://tickets.opscode.com/browse/OHAI-541

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