1st commit, checking error handler and g11n plugged together.