trigger errors instead of non-existant "message"
PSR2 fixes
more PSR2 fixes