Merge "Fix derefrencing of NULL pointer" into tizen