Fixed a null error with rider