How about both.

JW's grin only widened when they locked eyes. He lifted the hand that wasn't weighed down with bags to wave at him. And then his expression changed as poor Krem was jettisoned backwards.

"Shit!"

JW quickly rounded the side of the shop and ducked inside, stretching his neck to see over the machines. Once he spotted Krem's station through the unfamiliar layout, he picked his way over.

"You alright, soldier? I didn't think I was that scary."