Safe navigation operators FTW!

Have noticed a few NullPointerExceptions in production (possibly since my recent changes).