Log also if not diving
Added check for null