Added null check for OnGreet