Errors now implemented properly