Merge pull request #33 from jordanly/jly/fix-npe-in-sla-aware-updates