Added an APM validation check