Huge error fixed + security checks done to avoid that crash!