gustafn
committed
on 20 Feb 17
Improve robustness and provide better debugging info in error cases