Prevent IllegalArgumentException when recipient is null