Changed excpetion name based on feedback from dreid