Added some check
Added some more check