Issue #107: Fix an NPE
Issue #107: Fix spinner selection code