Fixed null-ref errors