Fixing up queue and exception handling.