Better error handling. Fix Friday night bug.