MOE-15: Fix NPE