I've kept the structure because I dont know if we need to add something in the future for handling the error... (In fact this is fixing an error that we had before).