Minor error-handling update