Merge "Fix potential crash"