This should protect us from a couple of possible buffer overflows

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>