Got first pass at error-handling wired up