Fixed Error Marking,
Fixed OnlyWhen check