The number of people around the world who are affected by humanitarian crises has almost doubled in the past decade. For instance, in 2016, Southern Africa experienced the worst drought in 35 years, due to the weather phenomenon El Niño, and all aspects of society were affected. The aim of this thesis is to identify and analyse different types of challenges humanitarian relief programmes face in their disaster management in two different contexts: a conflict and a non-conflict context. The thesis combines both disaster management and peace and conflict studies. Interviews have been conducted in Zimbabwe (non-conflict) and Mozambique (conflict) with INGOs, UN organisations and donors that were involved in the humanitarian relief programmes in the countries during the El Niño induced drought in 2016. The programmes experienced various challenges, and additional challenges have been found in the humanitarian relief programmes in Mozambique due to the conflict. This thesis contributes to the existing theory with one piece of the puzzle: combining the theories on disaster management and peace and conflict studies and showing that neighbouring countries to those in conflict are likely to get spillover challenges from the country in conflict, primarily due to issues with refugees.