Fixed bug in improper handling of null assists