Change for RuntimeException, and sync repo