diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 42d2315e54..0c322860dc 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -16,10 +16,12 @@
 
 #### General
 
+- \#1813 Check that priceInfo.pixelsPerUnit is not 0 (@kyriediculous)
+
 #### Broadcaster
 
 - \#1782 Fix SegsInFlight data-loss on refreshing O sessions (@darkdragon)
 
 #### Transcoder
 
-[Full list of changes](https://github.com/livepeer/go-livepeer/compare/v0.5.15...v0.5.16)
+[Full list of changes](https://github.com/livepeer/go-livepeer/compare/v0.5.15...v0.5.16)
\ No newline at end of file
diff --git a/discovery/db_discovery.go b/discovery/db_discovery.go
index 70ddc5f188..13e3343945 100644
--- a/discovery/db_discovery.go
+++ b/discovery/db_discovery.go
@@ -109,14 +109,14 @@ func (dbo *DBOrchestratorPoolCache) GetOrchestrators(numOrchestrators int, suspe
 		// check if O's price is below B's max price
 		maxPrice := server.BroadcastCfg.MaxPrice()
 		price, err := common.RatPriceInfo(info.PriceInfo)
-		if price == nil {
-			glog.V(common.DEBUG).Infof("no price info received for orch=%v", info.GetTranscoder())
-			return false
-		}
 		if err != nil {
 			glog.V(common.DEBUG).Infof("invalid price info orch=%v err=%v", info.GetTranscoder(), err)
 			return false
 		}
+		if price == nil {
+			glog.V(common.DEBUG).Infof("no price info received for orch=%v", info.GetTranscoder())
+			return false
+		}
 		if maxPrice != nil && price.Cmp(maxPrice) > 0 {
 			glog.V(common.DEBUG).Infof("orchestrator's price is too high orch=%v price=%v wei/pixel maxPrice=%v wei/pixel",
 				info.GetTranscoder(),