Code review. One ref queue, fix exception handling.