[OLINGO-409] Fix NPE in $expand call
3 files changed