#1606 Only waiting on waddellLock if no waddell information available yet