Added more checking to aim in diagnostics