Additional error handling.  Shouldn't choke on any notes now