Better handling of nil associations that come back from the server