Merge "fix bugs in exception throwing code in native_fillwindow"