1 files changed, 5 insertions, 4 deletions
diff --git a/WebSmart.pm b/WebSmart.pm
index c54ee19..ddc89cf 100644
--- a/WebSmart.pm
+++ b/WebSmart.pm
@@ -92,7 +92,7 @@ sub query {
     $root = $root->firstChild; # ResponseArray
     my $data = treeify($root);
     if (exists $data->{Record}) {
-      $self->address($data->{Address});
+      $self->address($data->{Record}->{Address});
       $self->code($data->{Record}->{Results});
     } else {
       $self->code($data->{Results});
@@ -100,7 +100,7 @@ sub query {
   } else {
     $self->message( $resp->status_line );
   }
-  if ( $geocode and $self->address and $self->address->{AddressKey} > 0 ) {
+  if ( $geocode and $self->address->{AddressKey} ) {
     $uri = URI->new($geocoder_uri);
     $uri->query_form(
       id => $opt{id},
@@ -199,11 +199,12 @@ error or warning messages.
 
 sub status_message {
   my $self = shift;
-  join("\n",
-    $self->message,
+  my $status = join("\n",
     map { $self->result_string($_) }
     split(',', $self->code)
   );
+  $status = join("\n", $self->message, $status) if $self->message and $status;
+  $status;
 }
 
 =head2 result_string CODE