Adjusted views ot handle errors