UPDATE: Minor endpoint exception handling changes