diff --git a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java
index e4f3ca5df594f6b3d04c8c7f6137eef0e083a1b0..e9ee91698adcdecd1449f7ec47a9084b94876f6e 100755
--- a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java
+++ b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java
@@ -181,8 +181,8 @@ public class AppleFruitMothController extends HttpServlet {
                             
                             ossc.setLastUpdated(SystemTime.getSystemTime());
                             ossc.setWarningStatus(formValidation.getFormField("warningStatus").getValueAsInteger());
-                            ossc.setDegreeOfParasitation(formValidation.getFormField("degreeOfParasitation") != null ? formValidation.getFormField("degreeOfParasitation").getValueAsDouble(): null);
-                            ossc.setThousandBerrySample(formValidation.getFormField("thousandBerrySample") != null ? formValidation.getFormField("thousandBerrySample").getValueAsDouble(): null);
+                            ossc.setDegreeOfParasitation( !formValidation.getFormField("degreeOfParasitation").isEmpty() ? formValidation.getFormField("degreeOfParasitation").getValueAsDouble(): null);
+                            ossc.setThousandBerrySample( !formValidation.getFormField("thousandBerrySample").isEmpty() ? formValidation.getFormField("thousandBerrySample").getValueAsDouble(): null);
                             ossc.setRemarks(formValidation.getFormField("remarks") != null ? formValidation.getFormField("remarks").getWebValue() : "");
                             observationSite.getObservationSiteSeasonCommonDataSet().add(ossc);
                             SessionControllerGetter.getAppleFruitMothBean().storeObservationSite(observationSite);
diff --git a/src/main/webapp/templates/appleFruitMothStationForm.ftl b/src/main/webapp/templates/appleFruitMothStationForm.ftl
index a8de8304e7b13ba5e9f760492e165b97e42a7b65..a5445f28855a10731cf926bf431098b3523f9c21 100755
--- a/src/main/webapp/templates/appleFruitMothStationForm.ftl
+++ b/src/main/webapp/templates/appleFruitMothStationForm.ftl
@@ -76,12 +76,12 @@
 				  </div>
 				<div class="form-group">
 				    <label for="degreeOfParasitation">${i18nBundle.degreeOfParasitation} (${i18nBundle.internal})</label>
-				    <input type="number" step="any" class="form-control" name="degreeOfParasitation" placeholder="${i18nBundle.degreeOfParasitation}" value="<#if observationSiteSeasonCommonData??>${observationSiteSeasonCommonData.degreeOfParasitation?c!""}</#if>" onblur="validateField(this);" />
+				    <input type="number" step="any" class="form-control" name="degreeOfParasitation" placeholder="${i18nBundle.degreeOfParasitation}" value="<#if observationSiteSeasonCommonData?? && observationSiteSeasonCommonData.degreeOfParasitation??>${observationSiteSeasonCommonData.degreeOfParasitation?c!""}</#if>" onblur="validateField(this);" />
 				    <span class="help-block" id="${formId}_degreeOfParasitation_validation"></span>
 				</div>
 				<div class="form-group">
 				    <label for="thousandBerrySample">${i18nBundle.thousandBerrySample} (${i18nBundle.internal})</label>
-				    <input type="number" step="any" class="form-control" name="thousandBerrySample" placeholder="${i18nBundle.thousandBerrySample}" value="<#if observationSiteSeasonCommonData??>${observationSiteSeasonCommonData.thousandBerrySample?c!""}</#if>" onblur="validateField(this);" />
+				    <input type="number" step="any" class="form-control" name="thousandBerrySample" placeholder="${i18nBundle.thousandBerrySample}" value="<#if observationSiteSeasonCommonData?? && observationSiteSeasonCommonData.thousandBerrySample??>${observationSiteSeasonCommonData.thousandBerrySample?c!""}</#if>" onblur="validateField(this);" />
 				    <span class="help-block" id="${formId}_thousandBerrySample_validation"></span>
 				</div>
                                 <div class="form-group">