diff --git a/compiler/frontend/src/org/jetbrains/kotlin/storage/ExceptionTracker.kt b/compiler/frontend/src/org/jetbrains/kotlin/storage/ExceptionTracker.kt
index 8d557d166b6..bf8575cc7bc 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/storage/ExceptionTracker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/storage/ExceptionTracker.kt
@@ -1,17 +1,6 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.storage
@@ -50,12 +39,12 @@ open class ExceptionTracker : ModificationTracker, LockBasedStorageManager.Excep
 }
 
 object CacheResetOnProcessCanceled {
-    private val PROPERTY = "kotlin.internal.cacheResetOnProcessCanceled"
-    private val DEFAULT_VALUE = true
+    private const val PROPERTY = "kotlin.internal.cacheResetOnProcessCanceled"
+    private const val DEFAULT_VALUE = true
 
     var enabled: Boolean
-        get() = PropertiesComponent.getInstance()!!.getBoolean(PROPERTY, DEFAULT_VALUE)
+        get() = PropertiesComponent.getInstance()?.getBoolean(PROPERTY, DEFAULT_VALUE) ?: DEFAULT_VALUE
         set(value) {
-            PropertiesComponent.getInstance()!!.setValue(PROPERTY, value, DEFAULT_VALUE)
+            PropertiesComponent.getInstance()?.setValue(PROPERTY, value, DEFAULT_VALUE)
         }
 }