Add check to prevent and log for #715

Signed-off-by: Ross Allan <rallanpcl@gmail.com>