Adding in some checks