From #199: #199 (comment)
Issue #109 might return after this merge, need to explicitly test for this as well as the NULL dereference on USB teardown reoccurring. #109 was originally addressed by #181 but #199 needing to revert the USB commit may have reintroduced it.
