diff --git a/CHANGELOG.md b/CHANGELOG.md
index 978f1cb769..e1627ef733 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,8 +17,9 @@
 - Fix controller hot loop when app source contains bad manifests (issue #568)
 - [UI] Fix issue where projects filter does not work when application got changed
 
-## v0.8.2 (2018-09-11)
+## v0.8.2 (2018-09-12)
 - Downgrade ksonnet from v0.12.0 to v0.11.0 due to quote unescape regression
+- Fix CLI panic when performing an initial `argocd sync/wait`
 
 ## v0.8.1 (2018-09-10)
 + [UI] Support selection of helm values files in App creation wizard (issue #499)
diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go
index d6ea4ed9ff..b862c31d6e 100644
--- a/cmd/argocd/commands/app.go
+++ b/cmd/argocd/commands/app.go
@@ -955,10 +955,12 @@ func calculateResourceStates(app *argoappv1.Application) map[string]*resourceSta
 	}
 
 	var opResult *argoappv1.SyncOperationResult
-	if app.Status.OperationState.SyncResult != nil {
-		opResult = app.Status.OperationState.SyncResult
-	} else if app.Status.OperationState.RollbackResult != nil {
-		opResult = app.Status.OperationState.SyncResult
+	if app.Status.OperationState != nil {
+		if app.Status.OperationState.SyncResult != nil {
+			opResult = app.Status.OperationState.SyncResult
+		} else if app.Status.OperationState.RollbackResult != nil {
+			opResult = app.Status.OperationState.SyncResult
+		}
 	}
 	if opResult == nil {
 		return resStates