Fix NPE
Merge pull request #25 from objectos/moe_15_npe

MOE-15: Fix NPE