Nil the error in case there is none, else it would always go to the error fallback
Merge pull request #73 from GabrielCartier/master

Nil the error in case there is none, else it would always go to the error fallback