Fix: Better error management
Qual: Better error management.
Qual: Uniformize code for canvas