Added dictionary checks to prevent key errors on non-provided data