Facebook: Moved around and improved some of the error validation