Fixed up uncaught errors