-Fix some checks to allow for null body userData