Prevent crash when CJ is missing from waiting list

TODO: find root cause!