[3.8] Fix 1489 Let errors happen when they occur