Added initial checks