Added error queue support;