Fix and add Verlet kernel error messages

Handles default cases better

Change-Id: I45d8ebd73184630180e6ed87d54c3a8fc3cbef73
Merge "Fix and add Verlet kernel error messages" into release-4-6