Add catch for #453. Needs testing once build is working again.