Fix: Removed warning
Fix: Error management