Be more graceful about handling null waitingapns

Change-Id: I8c620ef1f552ef776a238c69eb6e61a08e67c6f0