#1 unstable commit - error handling