Null request id fix