diff --git a/.idea/findbugs-idea.xml b/.idea/findbugs-idea.xml
index 10ae7e6c..c8493a76 100644
--- a/.idea/findbugs-idea.xml
+++ b/.idea/findbugs-idea.xml
@@ -124,7 +124,7 @@
         <entry key="InfiniteRecursiveLoop" value="true" />
         <entry key="InheritanceUnsafeGetResource" value="true" />
         <entry key="InitializationChain" value="true" />
-        <entry key="InitializeNonnullFieldsInConstructor" value="true" />
+        <entry key="InitializeNonnullFieldsInConstructor" value="false" />
         <entry key="InstantiateStaticClass" value="true" />
         <entry key="IntCast2LongAsInstant" value="true" />
         <entry key="InvalidJUnitTest" value="true" />
diff --git a/core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java
index 188caed4..587d9bc7 100644
--- a/core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java
+++ b/core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java
@@ -23,12 +23,10 @@
 package org.solovyev.android.calculator;
 
 import jscl.math.operator.Operator;
-
-import javax.annotation.Nonnull;
-
 import org.solovyev.common.JBuilder;
 import org.solovyev.common.math.MathRegistry;
 
+import javax.annotation.Nonnull;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -82,7 +80,7 @@ public class CalculatorPostfixFunctionsRegistry extends AbstractCalculatorMathRe
 	@Nonnull
 	@Override
 	protected JBuilder<? extends Operator> createBuilder(@Nonnull MathPersistenceEntity entity) {
-		return null;  //To change body of implemented methods use File | Settings | File Templates.
+		throw new UnsupportedOperationException();
 	}
 
 	@Override
@@ -92,12 +90,12 @@ public class CalculatorPostfixFunctionsRegistry extends AbstractCalculatorMathRe
 
 	@Override
 	protected MathPersistenceEntity transform(@Nonnull Operator entity) {
-		return null;  //To change body of implemented methods use File | Settings | File Templates.
+		return null;
 	}
 
 	@Nonnull
 	@Override
 	protected MathEntityPersistenceContainer<MathPersistenceEntity> createPersistenceContainer() {
-		return null;  //To change body of implemented methods use File | Settings | File Templates.
+        throw new UnsupportedOperationException();
 	}
 }