Added some checks...