Test behave a little differently. Adding a null check