Fixed pandora build
Fixed potential crash