Safer handling of error block related to #35