diff --git a/src/Entities/ExpOrb.cpp b/src/Entities/ExpOrb.cpp
index 27d34f6ed..248fb7278 100644
--- a/src/Entities/ExpOrb.cpp
+++ b/src/Entities/ExpOrb.cpp
@@ -49,8 +49,8 @@ void cExpOrb::Tick(float a_Dt, cChunk & a_Chunk)
 		double Distance(a_Distance.Length());
 		if (Distance < 0.1f)
 		{
+			LOGD("Player %s picked up an ExpOrb. His reward is %i", a_ClosestPlayer->GetName().c_str(), m_Reward);
 			a_ClosestPlayer->DeltaExperience(m_Reward);
-			a_ClosestPlayer->SendExperience();
 			Destroy(true);
 		}
 		a_Distance.Normalize();
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 091623c8a..0e2da942d 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -274,6 +274,7 @@ void cMonster::KilledBy(cEntity * a_Killer)
 		case cMonster::mtWolf:
 		{
 			Reward = m_World->GetTickRandomNumber(2) + 1;
+			break;
 		}
 
 		// Monsters
@@ -291,25 +292,30 @@ void cMonster::KilledBy(cEntity * a_Killer)
 		case cMonster::mtMagmaCube:
 		{
 			Reward = 6 + (m_World->GetTickRandomNumber(2));
+			break;
 		}
 		case cMonster::mtBlaze:
 		{
 			Reward = 10;
+			break;
 		}
 
 		// Bosses
 		case cMonster::mtEnderDragon:
 		{
 			Reward = 12000;
+			break;
 		}
 		case cMonster::mtWither:
 		{
 			Reward = 50;
+			break;
 		}
 
 		default:
 		{
 			Reward = 0;
+			break;
 		}
 	}
 	m_World->SpawnExperienceOrb(GetPosX(), GetPosY(), GetPosZ(), Reward);