Added another error page detection.
Merge remote-tracking branch 'dm/develop' into develop