Fix nil access