a few more fixes to edge cases (null return / timeout)