minor reorg for better stack traces
1.0.2