Made parsing queue closing even more graceful