Fixed nullPointer exception/seem like stable build