Agree, I believe it needs refactoring anyway, because errors come back different from the server now. @kleinsch mentioned he would fix that up.