fixed some of the more obvious frogatto errors with the new null checking