I added error handling to this in https://github.com/mozilla/webmaker.org/pull/370/files, can you add it back please?