fixes #11 removed some error handling which will never get hit (I hope)