Better error handling
Better error handling

zhwa/thunder,kcompher/thunder,mikarubi/thunder,pearsonlab/thunder,jwittenbach/thunder,kcompher/thunder,oliverhuangchao/thunder,poolio/thunder,poolio/thunder,mikarubi/thunder,kunallillaney/thunder,kunallillaney/thunder,zhwa/thunder,broxtronix/thunder,thunder-project/thunder,broxtronix/thunder,j-friedrich/thunder,j-friedrich/thunder,pearsonlab/thunder,oliverhuangchao/thunder