gustafn
committed
on 14 May 16
- avoid potential recursive loop in error handler