Moved method check into the method that uses the method