Merge "Submit: Fix NPE"