diff --git a/src/pocketmine/network/mcpe/protocol/BookEditPacket.php b/src/pocketmine/network/mcpe/protocol/BookEditPacket.php
index 961ee1a81..759ff57be 100644
--- a/src/pocketmine/network/mcpe/protocol/BookEditPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/BookEditPacket.php
@@ -109,7 +109,7 @@ class BookEditPacket extends DataPacket{
 				$this->putString($this->xuid);
 				break;
 			default:
-				throw new \UnexpectedValueException("Unknown book edit type $this->type!");
+				throw new \InvalidArgumentException("Unknown book edit type $this->type!");
 		}
 	}
 
diff --git a/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php b/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php
index 7045178f2..b0cd3d317 100644
--- a/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php
@@ -91,7 +91,7 @@ class ClientboundMapItemDataPacket extends DataPacket{
 				}elseif($object->type === MapTrackedObject::TYPE_ENTITY){
 					$object->entityUniqueId = $this->getEntityUniqueId();
 				}else{
-					throw new \UnexpectedValueException("Unknown map object type");
+					throw new \UnexpectedValueException("Unknown map object type $object->type");
 				}
 				$this->trackedEntities[] = $object;
 			}
@@ -163,7 +163,7 @@ class ClientboundMapItemDataPacket extends DataPacket{
 				}elseif($object->type === MapTrackedObject::TYPE_ENTITY){
 					$this->putEntityUniqueId($object->entityUniqueId);
 				}else{
-					throw new \UnexpectedValueException("Unknown map object type");
+					throw new \InvalidArgumentException("Unknown map object type $object->type");
 				}
 			}
 
diff --git a/src/pocketmine/network/mcpe/protocol/DataPacket.php b/src/pocketmine/network/mcpe/protocol/DataPacket.php
index a21de3fb1..0eeb9abe8 100644
--- a/src/pocketmine/network/mcpe/protocol/DataPacket.php
+++ b/src/pocketmine/network/mcpe/protocol/DataPacket.php
@@ -61,12 +61,20 @@ abstract class DataPacket extends NetworkBinaryStream{
 		return false;
 	}
 
+	/**
+	 * @throws \OutOfBoundsException
+	 * @throws \UnexpectedValueException
+	 */
 	public function decode() : void{
 		$this->rewind();
 		$this->decodeHeader();
 		$this->decodePayload();
 	}
 
+	/**
+	 * @throws \OutOfBoundsException
+	 * @throws \UnexpectedValueException
+	 */
 	protected function decodeHeader() : void{
 		$pid = $this->getUnsignedVarInt();
 		if($pid !== static::NETWORK_ID){
@@ -76,6 +84,9 @@ abstract class DataPacket extends NetworkBinaryStream{
 
 	/**
 	 * Note for plugin developers: If you're adding your own packets, you should perform decoding in here.
+	 *
+	 * @throws \OutOfBoundsException
+	 * @throws \UnexpectedValueException
 	 */
 	protected function decodePayload() : void{
 
diff --git a/src/pocketmine/network/mcpe/protocol/SetScorePacket.php b/src/pocketmine/network/mcpe/protocol/SetScorePacket.php
index 52e6c915c..f3e7ec194 100644
--- a/src/pocketmine/network/mcpe/protocol/SetScorePacket.php
+++ b/src/pocketmine/network/mcpe/protocol/SetScorePacket.php
@@ -81,7 +81,7 @@ class SetScorePacket extends DataPacket{
 						$this->putString($entry->customName);
 						break;
 					default:
-						throw new \UnexpectedValueException("Unknown entry type $entry->type");
+						throw new \InvalidArgumentException("Unknown entry type $entry->type");
 				}
 			}
 		}
diff --git a/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php b/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php
index 1c9bae16a..25f8c5b36 100644
--- a/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php
+++ b/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php
@@ -159,6 +159,7 @@ class NetworkInventoryAction{
 	 * @param Player $player
 	 *
 	 * @return InventoryAction|null
+	 *
 	 * @throws \UnexpectedValueException
 	 */
 	public function createInventoryAction(Player $player) : ?InventoryAction{