Merge "Bug 2131 - NPE when starting controller"