Fixed minor error in t-error check, removed extra return in master.