Rather than testing MOD->elferr, I think it would be cleaner to break the "if (fallback)" code out into a subroutine so the switch can continue to use return to avoid the error-case cleanup code. Thanks, Roland