Clean up of names and better catching of error.