Removed some error cases