Workaround for issue 26

Quick and dirty workaround, I assume there is a better solution that takes advantage of when's error handling