Moved basic checks to own method