Merge "ErrorPageError and subclasses use array() instead of null per their docs"