NPE wasn't handled and caused stop to fail. fixed now