Adding couple of checks