fix multiple exceptions in various corner cases