Merge "Fixed NULL pointer dereference." into tizen_4.0