Better error handling

Created by  Nathan  on July 27, 2017
ADXMUSFXOKBPCHW4XS3T4KLWMPGQPYDMZW6YFFSHZPAQKEGIKCBQC
Change contents