Handle extras
Added error page