Throwing exceptions on some untracked errors
Merge commit '1f0b183' into 3.3/master