Added some empty field checking.