OHAI-541: catch more opportunities for invalid returns
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.

cmluciano/ohai,375gnu/ohai,375gnu/ohai,Juniper/ohai,johnbellone/ohai,Fodoj/ohai,n-marton/ohai,criteo-forks/ohai,phreakocious/ohai,tas50/ohai-1,jseely/ohai,higanworks/ohai,http-418/ohai,adamleff/ohai,jbfavre/ohai,sh9189/ohai,glennmatthews/ohai,jaymzh/ohai,johnbellone/ohai,Juniper/ohai,chef/ohai,davide125/ohai,tas50/ohai-1,btm/ohai,adamleff/ohai,chef/ohai,juliandunn/ohai,cmluciano/ohai,glennmatthews/ohai,davide125/ohai,acaiafa/ohai,mattray/ohai,bougyman/ohai,n-marton/ohai,numericillustration/ohai,shtzr840329/ohai,btm/ohai,criteo-forks/ohai,jaymzh/ohai,dreamnite/ohai,numericillustration/ohai,phreakocious/ohai,bougyman/ohai,Fodoj/ohai,higanworks/ohai,nathwill/ohai,dreamnite/ohai,sh9189/ohai,acaiafa/ohai,jbfavre/ohai,mattray/ohai,shtzr840329/ohai,nathwill/ohai,zshuo/ohai,http-418/ohai,juliandunn/ohai,jseely/ohai,zshuo/ohai