Make sure data fields are not exceeded

Authored by tbaumgart on Sep 2 2018, 12:57 PM.