Upped the timeout slightly and added begin/rescue block