Cleanup on code path that should never be used, now safer and prints a warning.