improved stability more via better error handling