null exception should be fixed now