Yeah... this was replicating existing behavior, but forcing it to not return null... it's not ideal.