Fix code quality issue (don't raise Exception)