Move to generic error handling across all pages