diff --git a/components/address.inc b/components/address.inc
index 8db97c8..b807bfc 100644
--- a/components/address.inc
+++ b/components/address.inc
@@ -463,7 +463,7 @@ function _address_ajax_callback($form, $form_state) {
 
   $errors = array();
   $postal_code = $values['postal_code'];
-  _address_validate_postal_code($postal_code, FALSE, $errors);
+  _address_validate_postal_code($postal_code, $errors);
   if ($form_state['triggering_element']['#webform_component']['extra']['internal_postal_codes'] == TRUE) {
     $internal_postal_codes = explode(',', $form_state['triggering_element']['#webform_component']['extra']['internal_postal_codes_list']);
     _address_validate_internal_postal_codes($postal_code, $internal_postal_codes, $errors);
@@ -472,7 +472,7 @@ function _address_ajax_callback($form, $form_state) {
     $house_number = $values['house_number'];
     $house_letter = $values['house_letter'];
     $house_number_addition = $values['house_number_addition'];
-    _address_validate_house_number($house_number, FALSE, $errors);
+    _address_validate_house_number($house_number, $errors);
     _address_validate_house_letter($house_letter, $errors);
     _address_validate_house_number_addition($house_number_addition, $errors);
   }
@@ -860,7 +860,7 @@ function dvg_webform_components_address_validate_addresscheck($element, &$form_s
 
   $errors = array();
   $postal_code = $element['postal_code']['#value'];
-  _address_validate_postal_code($postal_code, $element['postal_code']['#webform_component']['required'], $errors);
+  _address_validate_postal_code($postal_code, $errors);
 
   if ($element['#webform_component']['extra']['internal_postal_codes'] == TRUE) {
     $internal_postal_codes = explode(',', $element['#webform_component']['extra']['internal_postal_codes_list']);
@@ -869,13 +869,13 @@ function dvg_webform_components_address_validate_addresscheck($element, &$form_s
 
   if (!empty($element['#webform_component']['extra']['po_box'])) {
     $po_box = $element['po_box']['#value'];
-    _address_validate_po_box($element, $po_box, $element['#webform_component']['required']);
+    _address_validate_po_box($element, $po_box);
   }
   else {
     $house_number = $element['house_number']['#value'];
     $house_letter = $element['house_letter']['#value'];
     $house_number_addition = $element['house_number_addition']['#value'];
-    _address_validate_house_number($house_number, $element['house_number']['#webform_component']['required'], $errors);
+    _address_validate_house_number($house_number, $errors);
     _address_validate_house_letter($house_letter, $errors);
     _address_validate_house_number_addition($house_number_addition, $errors);
   }
@@ -940,7 +940,7 @@ function dvg_webform_components_address_validate_addresscheck($element, &$form_s
 /**
  * Postal code validation and space removal.
  */
-function _address_validate_postal_code(&$postal_code, $required, &$errors) {
+function _address_validate_postal_code(&$postal_code, &$errors) {
   $postal_code = trim(str_replace(' ', '', $postal_code));
   if (!empty($postal_code)) {
     preg_match('/^([1-9][0-9]{3}) ?([A-Za-z]{2})$/', $postal_code, $matches);
@@ -980,7 +980,7 @@ function _address_validate_list_internal_postal_codes($element, &$form_state) {
 /**
  * Validation handler for house number.
  */
-function _address_validate_house_number($house_number, $required, &$errors) {
+function _address_validate_house_number($house_number, &$errors) {
   $value = trim($house_number);
   if (!empty($value) && !preg_match('/^[1-9]{1}[0-9]{0,4}$/i', $value)) {
     $errors[] = t('The house number has to be an integer in the range 1 till 99999');
@@ -1010,7 +1010,7 @@ function _address_validate_house_number_addition($house_number_addition, &$error
 /**
  * Validation handler for po box number.
  */
-function _address_validate_po_box($element, $po_box, $required) {
+function _address_validate_po_box($element, $po_box) {
   $value = trim($po_box);
   if (!empty($value) && !preg_match('/^[1-9]{1}[0-9]{0,4}$/i', $value)) {
     $errors = t('The PO box has to be an integer in the range 1 till 99999');
diff --git a/dvg_webform_components.module b/dvg_webform_components.module
index 95aabc1..634ed5c 100644
--- a/dvg_webform_components.module
+++ b/dvg_webform_components.module
@@ -165,6 +165,8 @@ function _dvg_webform_components_webform_validator($form, &$form_state) {
   $old_messages = array();
   if (!empty($_SESSION['messages']['error'])) {
     $old_messages = $_SESSION['messages']['error'];
+    // Clear messages as they will be reset if necessary at the end.
+    unset($_SESSION['messages']['error']);
   }
 
   $form_errors = form_get_errors();
@@ -176,7 +178,7 @@ function _dvg_webform_components_webform_validator($form, &$form_state) {
     foreach ($form_errors as $key => $message) {
       $parts = explode('][', $key);
       $last_part = array_pop($parts);
-      // Set all adres errors on their matching parent.
+      // Set all address errors on their matching parent.
       if (in_array($last_part, _dvg_webform_components_custom_validator_components())) {
         if ($last_part != 'block') {
           // Set empty message on the element for highlighting the element.