cosmetic
correct error handling