Fix: Don't concat with NULL
Enhancement: "event_handler" method names should be PSR-3 conform