Add protection from blank records