Beginning to add proper exceptions
Beginning to add proper exceptions