Changing to empty check to allow for other empty types