Fixed exception message
Removed the need for a context