Issue 352 warning system