Fixed Exceptions create & edit staff and clean up