@@ -1,6 +1,9 @@
 ## 0.4.1 (unreleased)
 
+BUG FIXES:
 
+  * command/remote-config: remove spurrious error "nil" when initializing
+      remote state on a new configuration. [GH-1392]
 
 ## 0.4.0 (April 2, 2015)
 
@@ -13,7 +16,7 @@ BACKWARDS INCOMPATIBILITIES:
   * Period-prefixed configuration files are now ignored. This might break
     existing Terraform configurations if you had period-prefixed files.
   * The `block_device` attribute of `aws_instance` has been removed in favor
-    of three more specific attributes to specify block device mappings: 
+    of three more specific attributes to specify block device mappings:
     `root_block_device`, `ebs_block_device`, and `ephemeral_block_device`.
     Configurations using the old attribute will generate a validation error
     indicating that they must be updated to use the new fields [GH-1045].
 
@@ -255,8 +255,8 @@ func remoteState(
 					"Error preparing remote state: {{err}}", err)
 			}
 		default:
-			return nil, errwrap.Wrapf(
-				"Error initilizing remote state: {{err}}", err)
+			return nil, fmt.Errorf(
+				"Unknown refresh result: %s", cache.RefreshResult())
 		}
 	}
 
 
@@ -2,7 +2,6 @@ package state
 
 import (
 	"fmt"
-	"reflect"
 
 	"github.com/hashicorp/terraform/terraform"
 )
@@ -77,7 +76,7 @@ func (s *CacheState) RefreshState() error {
 		s.refreshResult = CacheRefreshUpdateLocal
 	case durable.Serial == cached.Serial:
 		// They're supposedly equal, verify.
-		if reflect.DeepEqual(cached, durable) {
+		if cached.Equal(durable) {
 			// Hashes are the same, everything is great
 			s.refreshResult = CacheRefreshNoop
 			break
Original file line number	Diff line number	Diff line change
`@@ -255,8 +255,8 @@ func remoteState(`
`255`	`255`	`"Error preparing remote state: {{err}}", err)`
`256`	`256`	`}`
`257`	`257`	`default:`
`258`		`- return nil, errwrap.Wrapf(`
`259`		`- "Error initilizing remote state: {{err}}", err)`
	`258`	`+ return nil, fmt.Errorf(`
	`259`	`+ "Unknown refresh result: %s", cache.RefreshResult())`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`