random cleanups

I don't understand why this error is not handled?