Merge "Fix for NPE in Switch"