Use proper terminology and introduce error check