instead of return statements in cases, setting local variable to avoid...

instead of return statements in cases, setting local variable to avoid compiler errors when default case is missing (although default will never be reached!)