Fixed query string null pointer exceptions...