Commented Queue, Added new exceptions