Added null checks to bedchecks