Fix verify to work with updates and null values, also add a test
Add check for stops which already have messages