Hotfixes production take 2

Rebased sin los errores de fin-de-línea.
Avoid using `rescue` in its modifier form.