add spork config back to guard
change null handler to be a more robust null object