am 7e254a37: Merge "Fix script init error handling."

* commit '7e254a37d0beb1fe307ca45617fbe7cc394d275f':
  Fix script init error handling.