Added an exception handler for RecordNotFound