Added some error handling, I think I know what's happening but not why.