Improve error catching/logging by push class. Also simplify model and form for adding messages slightly.