Merge "RC: Handle getLine returning null, which breaks Redis engine (at least HHVM)"