Tweaks on errorcatching