Fix tab order and possible exception