Merge missing buffer bug fix from jaynel/history-bug
Handle invalid cxy_ctl table names