Updated creditionals check to make sure they are passed

Updated creditionals check to make sure they are passed in the correct format that are expected