Fix a silly "forget about q return null" bug