Write in some simple null checks for new material handling