fixing nullPointerException on attempt to edit Matt