More error checking for testing and added an exception for no token found. I created an erro template that is blank right now and needs to be modified to say something more useful, but it is better that a stack trace