Always fallback to a working adapter
Merge pull request #21 from dennisdegreef/cleanup

Always fallback to a working adapter