This is more robust in case some change or corner case causes them to be dereferenced before being set Fixes CID1396274, CID1396275 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>