Perhaps return an empty hash if the calculator returns nil so we don't need the nil check above?