Added check to make sure public address