Sporadic null pointer exceptions came from here. Fix them.
Signed-off-by: NWill Thomas <will.thomas@imgtec.com>
Reviewed-by: NJames Hartley <james.hartley@imgtec.com>
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>